Changeset 18230 in josm for trunk


Ignore:
Timestamp:
2021-09-27T00:35:48+02:00 (3 years ago)
Author:
Don-vip
Message:

fix #20530 - fix #20531 - Add man_made pump preset, deprecate man_made=pumping_rig, pump:type=* and substance=heat (patch and icons by skyper, François Lacombe and gaben)

Location:
trunk/resources
Files:
18 added
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r18210 r18230  
    473473        </optional>
    474474    </chunk>
    475     <chunk id="operator_substance">
    476         <text key="operator" text="Operator" />
    477         <combo key="substance" text="Substance" values="water,gas,heat,oil,sewage" />
     475    <chunk id="substance">
     476        <combo key="substance" text="Substance" values="water,hot_water,steam,sewage,gas,oil" values_sort="false" values_searchable="true" />
     477    </chunk>
     478    <chunk id="handle">
     479        <optional text="Only in case of manual actuator or manual mechanical drive: ">
     480        <combo key="handle" text="Handle" values="wheel,cross,lever,crank,button,no" values_context="handle" values_sort="false" values_searchable="true" />
     481        <combo key="turn_to_close" text="Direction to close" values="clockwise,anti_clockwise" />
     482        </optional>
     483        <space />
     484    </chunk>
     485    <chunk id="pumpMechanism">
     486        <combo key="pump_mechanism" text="Pump mechanism" values="gear,screw,progressive_cavity,diaphragm,peristaltic,rope,rotary_vane,piston,centrifugal,axial_flow,eductor_jet,ram,siphon,pulser,airlift" values_sort="false" values_searchable="true" />
     487    </chunk>
     488    <chunk id="mechCoupling">
     489        <combo key="mechanical_coupling" text="Mechanical coupling" values="direct,reducer,gearbox,nodding_donkey,belt" values_sort="false" values_searchable="true" />
     490    </chunk>
     491    <chunk id="pump_details">
     492        <reference ref="pumpMechanism" />
     493        <combo key="mechanical_driver" text="Mechanical driver" values="manual,electric_motor,combustion_engine,reciprocating_solenoid,cylinder,turbine" values_sort="false" values_searchable="true" />
     494        <reference ref="mechCoupling" />
    478495    </chunk>
    479496    <chunk id="support">
    … …  
    20462063                <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
    20472064                <text key="pressure" text="Pressure (bar)" />
     2065                <text key="flow_rate" text="Flow rate with unit of measure" />
    20482066                <combo key="material" text="Material" values="metal,steel" />
    20492067            </optional>
    … …  
    56035621            <space />
    56045622            <key key="man_made" value="chimney" />
    5605             <reference ref="name_operator" />
     5623            <reference ref="name_ref_operator" />
    56065624            <text key="height" text="Height (meters)" length="7" />
    56075625        </item> <!-- Chimney -->
    … …  
    56105628            <space />
    56115629            <key key="man_made" value="kiln" />
    5612             <reference ref="name_operator" />
     5630            <reference ref="name_ref_operator" />
    56135631            <combo key="product" text="Product" values="lime,charcoal,bricks" />
    56145632        </item> <!-- Kiln -->
    … …  
    56175635            <space />
    56185636            <key key="man_made" value="windmill" />
    5619             <text key="name" text="Name" />
     5637            <reference ref="name_ref_operator" />
    56205638        </item> <!-- Windmill -->
     5639        <item name="Windpump" icon="presets/landmark/windpump.svg" type="node,closedway" preset_name_label="true">
     5640            <link wiki="Tag:man_made=windpump" />
     5641            <space />
     5642            <key key="man_made" value="windpump" />
     5643            <reference ref="substance" />
     5644            <optional>
     5645                <reference ref="pumpMechanism" />
     5646                <reference ref="mechCoupling" />
     5647                <reference ref="handle" />
     5648                <text key="pressure" text="Pressure (bar)" />
     5649                <text key="flow_rate" text="Flow rate with unit of measure" />
     5650                <space />
     5651                <reference ref="name_ref_operator" />
     5652                <text key="manufacturer" text="Manufacturer" />
     5653            </optional>
     5654            <preset_link preset_name="Pump" text="Similar but different tags:" />
     5655            <preset_link preset_name="Water Well" text="Similar but different tags:" />
     5656            <preset_link preset_name="Petroleum Well" text="Similar but different tags:" />
     5657        </item> <!-- Windpump-->
     5658        <item name="Pump" icon="presets/landmark/pump.svg" type="node,closedway" preset_name_label="true">
     5659            <link wiki="Tag:man_made=pump" />
     5660            <space />
     5661            <key key="man_made" value="pump" />
     5662            <reference ref="substance" />
     5663            <optional>
     5664                <reference ref="pump_details" />
     5665                <reference ref="handle" />
     5666                <text key="pressure" text="Pressure (bar)" />
     5667                <text key="flow_rate" text="Flow rate with unit of measure" />
     5668                <space />
     5669                <reference ref="name_ref_operator" />
     5670                <text key="manufacturer" text="Manufacturer" />
     5671                <combo key="location" text="Location" values="outdoor,indoor,underground,underwater" values_context="pump" />
     5672            </optional>
     5673            <preset_link preset_name="Windpump" text="Similar but different tags:" />
     5674            <preset_link preset_name="Water Well" text="Similar but different tags:" />
     5675            <preset_link preset_name="Petroleum Well" text="Similar but different tags:" />
     5676        </item> <!-- Pump -->
     5677        <item name="Petroleum Well" icon="presets/landmark/petroleum_well.svg" type="node,closedway" preset_name_label="true">
     5678            <link wiki="Tag:man_made=petroleum_well" />
     5679            <space />
     5680            <key key="man_made" value="petroleum_well" />
     5681            <combo key="substance" text="Substance" values="gas,oil" />
     5682            <optional>
     5683                <reference ref="pump_details" />
     5684                <reference ref="handle" />
     5685                <text key="pressure" text="Pressure (bar)" />
     5686                <text key="flow_rate" text="Flow rate with unit of measure" />
     5687                <space />
     5688                <reference ref="name_ref_operator" />
     5689                <text key="manufacturer" text="Manufacturer" />
     5690            </optional>
     5691            <preset_link preset_name="Water Well" text="Similar but different tags:" />
     5692            <preset_link preset_name="Windpump" text="Similar but different tags:" />
     5693            <preset_link preset_name="Pump" text="Similar but different tags:" />
     5694        </item> <!-- Petroleum Well -->
    56215695        <item name="Gasometer" icon="presets/landmark/gasometer.svg" type="node,closedway" preset_name_label="true">
    56225696            <link wiki="Tag:man_made=gasometer" />
    5623             <space />
    56245697            <key key="man_made" value="gasometer" />
    56255698            <optional>
    5626                 <reference ref="name_operator" />
     5699                <reference ref="name_ref_operator" />
    56275700                <combo key="building" text="Building" values="gasometer" values_context="building" />
    56285701                <text key="height" text="Height (meters)" length="7" />
    … …  
    56315704        <item name="Silo" icon="presets/landmark/silo.svg" type="node,closedway" preset_name_label="true">
    56325705            <link wiki="Tag:man_made=silo" />
    5633             <space />
    56345706            <key key="man_made" value="silo" />
    56355707            <optional>
    5636                 <reference ref="name_operator" />
     5708                <reference ref="name_ref_operator" />
    56375709                <combo key="building" text="Building" values="silo" values_context="building" />
    56385710                <text key="height" text="Height (meters)" length="7" />
    … …  
    56435715            <key key="man_made" value="storage_tank" />
    56445716            <optional>
    5645                 <reference ref="name_operator" />
     5717                <reference ref="name_ref_operator" />
    56465718                <combo key="building" text="Building" values="storage_tank" values_context="building" />
    56475719                <combo key="content"  text="Content" values="fuel,manure,oil,sewage,silage,slurry,water,wine" values_context="content" />
    … …  
    56515723        <item name="Bunker Silo" icon="presets/landmark/bunker_silo.svg" type="node,closedway" preset_name_label="true">
    56525724            <link wiki="Tag:man_made=bunker_silo" />
    5653             <space />
    56545725            <key key="man_made" value="bunker_silo" />
    56555726            <optional>
    5656                 <reference ref="name_operator" />
     5727                <reference ref="name_ref_operator" />
    56575728            </optional>
    56585729        </item> <!-- Bunker Silo -->
    56595730        <item name="Crane" icon="presets/landmark/crane.svg" type="node,way,closedway" preset_name_label="true">
    56605731            <link wiki="Tag:man_made=crane" />
    5661             <space />
    56625732            <key key="man_made" value="crane" />
    56635733            <optional>
    56645734                <combo key="crane:type" text="Type" values="floor-mounted_crane,gantry_crane,portal_crane,travel_lift" />
    5665                 <reference ref="name_operator" />
     5735                <reference ref="name_ref_operator" />
    56665736            </optional>
    56675737        </item> <!-- Crane -->
    56685738        <item name="Goods conveyor" icon="presets/landmark/goods_conveyor.svg" type="way" preset_name_label="true">
    56695739            <link wiki="Tag:man_made=goods_conveyor" />
    5670             <space />
    56715740            <key key="man_made" value="goods_conveyor" />
    56725741            <optional>
    5673                 <reference ref="name_operator" />
     5742                <reference ref="name_ref_operator" />
    56745743                <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
    56755744                <checkgroup columns="3">
    … …  
    56845753            <space />
    56855754            <key key="man_made" value="pumping_station" />
    5686             <reference ref="name_ref" />
    5687             <reference ref="operator_substance" />
     5755            <reference ref="name_ref_operator" />
     5756            <reference ref="substance" />
    56885757        </item> <!-- Pumping station -->
    56895758        <item name="Mineshaft" icon="presets/landmark/mine.svg" type="node,closedway" preset_name_label="true">
    … …  
    59466015            <space />
    59476016            <key key="man_made" value="pipeline" />
    5948             <reference ref="name_ref" />
    5949             <reference ref="operator_substance" />
     6017            <reference ref="name_ref_operator" />
     6018            <reference ref="substance" />
    59506019            <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
    59516020            <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
    59526021            <text key="pressure" text="Pressure (bar)" />
     6022            <text key="flow_rate" text="Flow rate with unit of measure" />
    59536023        </item> <!-- Pipeline -->
    59546024        <item name="Pipeline Substation" icon="presets/misc/pipeline_substation.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    59576027            <key key="pipeline" value="substation" />
    59586028            <text key="name" text="Name" />
    5959             <combo key="substation" text="Type" values="compression,distribution,field_gathering,inspection_gauge,measurement,valve,valve_group" values_context="pipeline" />
    5960             <text key="ref" text="Reference" />
    5961             <reference ref="operator_substance" />
     6029            <combo key="substation" text="Type" values="compression,distribution,field_gathering,inspection_gauge,measurement,valve,valve_group" values_context="pipeline" values_searchable="true" />
     6030            <reference ref="ref_operator" />
     6031            <reference ref="substance" />
    59626032        </item> <!-- Pipeline Substation -->
    59636033        <item name="Pipeline Valve" icon="presets/misc/valve.svg" type="node" preset_name_label="true">
    … …  
    59656035            <space />
    59666036            <key key="pipeline" value="valve" />
    5967             <combo key="valve" text="Valve type" values="butterfly,globe,ball,plug,gate,needle,spool" values_context="valve" />
    5968             <combo key="actuator" text="Actuator" values="electric_motor,hydraulic_cylinder,manual,pneumatic_cylinder,solenoid,thermostatic" values_context="actuator" />
    5969             <combo key="handle" text="Handle" values="lever,wheel,cross,button" values_context="handle" />
    5970             <combo key="turn_to_close" text="Direction to close" values="clockwise,anti_clockwise" />
     6037            <combo key="valve" text="Valve type" values="butterfly,globe,ball,plug,gate,needle,spool" values_context="valve" values_searchable="true" />
     6038            <combo key="actuator" text="Actuator" values="manual,electric_motor,hydraulic_cylinder,pneumatic_cylinder,solenoid,thermostatic" values_context="actuator" values_searchable="true" values_sort="false" />
     6039            <reference ref="handle" />
    59716040            <combo key="sensor:position" text="Position sensor" values="optical,mechanical,inductive,yes" />
    59726041            <reference ref="ref_operator" />
    … …  
    59766045            <space />
    59776046            <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key" />
    5978             <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" />
     6047            <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true" />
    59796048            <optional>
    59806049                <reference ref="ref_operator" />
    … …  
    60246093            <space />
    60256094            <key key="man_made" value="water_well" />
    6026             <optional>
    6027                 <text key="name" text="Name" />
    6028                 <combo key="pump" text="Pump" values="yes,no,manual,powered"  values_sort="false"/>
    6029             </optional>
     6095            <combo key="pump" text="Pump" values="yes,no,manual,powered" values_sort="false"/>
     6096            <optional>
     6097                <reference ref="pump_details" />
     6098                <reference ref="handle" />
     6099                <text key="pressure" text="Pressure (bar)" />
     6100                <text key="flow_rate" text="Flow rate with unit of measure" />
     6101                <space />
     6102                <reference ref="name_ref_operator" />
     6103            </optional>
     6104            <preset_link preset_name="Petroleum Well" text="Similar but different tags:" />
     6105            <preset_link preset_name="Windpump" text="Similar but different tags:" />
     6106            <preset_link preset_name="Pump" text="Similar but different tags:" />
    60306107        </item> <!-- Water Well -->
    60316108    </group> <!-- Water -->

  • trunk/resources/data/validator/combinations.mapcss

    r18112 r18230  
    126126}
    127127
    128 /* {0.tag} without {1.key} (warning level), #18411, #18246 */
     128/* {0.key} without {1.tag}, {2.tag}, {3.tag} or {4.tag}, #20530 */
     129*[pump_mechanism][man_made!=pump][man_made!=windpump][man_made!=water_well][man_made!=petroleum_well] {
     130  throwWarning: tr("{0} without {1}, {2}, {3} or {4}", "{0.key}", "{1.tag}", "{2.tag}", "{3.tag}", "{4.tag}");
     131  group: tr("missing tag");
     132}
     133
     134/* {0.tag} without {1.key} (warning level), #18411, #18246, #20530 */
    129135way[railway=construction][!construction],
    130136way[highway=construction][!construction],
    131137node[traffic_sign=maxspeed][!maxspeed][!/^maxspeed:.+/],
    132 node[actuator=manual][!handle],
     138*[actuator=manual][!handle],
     139*[mechanical_driver=manual][!handle],
    133140node[emergency=fire_hydrant][!fire_hydrant:type],
    134141way[     boundary=administrative][!admin_level],
    … …  
    246253}
    247254
    248 /* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888 */
     255/* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888, #20530 */
    249256*[power=plant][/^generator:/],
    250257*[power=generator][/^plant:/],
    … …  
    256263*[amenity=vending_machine][shop],
    257264*[noname?][name],
     265*[actuator][handle][actuator !~ /(^|;)manual(;|$)/],
     266*[mechanical_driver][handle][mechanical_driver !~ /(^|;)manual(;|$)/],
    258267way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no],
    259268way[oneway=yes][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][oneway:bicycle!=no][oneway:psv!=no],

  • trunk/resources/data/validator/deprecated.mapcss

    r18188 r18230  
    22782278}
    22792279
     2280/* #20530 */
     2281*[man_made=pumping_rig][!pump_mechanism][!mechanical_driver][!mechanical_coupling] {
     2282  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2283  suggestAlternative: "man_made=petroleum_well";
     2284  suggestAlternative: "man_made=water_well";
     2285  fixAdd: "pump_mechanism=piston";
     2286  fixAdd: "mechanical_driver=combustion_engine";
     2287  fixAdd: "mechanical_coupling=nodding_donkey";
     2288  group: tr("deprecated tagging");
     2289  set pumping_ring_no_mech;
     2290}
     2291*[man_made=pumping_rig]!.pumping_ring_no_mech {
     2292  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2293  suggestAlternative: "man_made=petroleum_well";
     2294  suggestAlternative: "man_made=water_well";
     2295  group: tr("deprecated tagging");
     2296}
     2297*[pump:type=beam_pump][!pump_mechanism][!mechanical_driver][!mechanical_coupling] {
     2298  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2299  suggestAlternative: "pump_mechanism";
     2300  fixRemove: "pump:type";
     2301  fixAdd: "pump_mechanism=piston";
     2302  fixAdd: "mechanical_driver=combustion_engine";
     2303  fixAdd: "mechanical_coupling=nodding_donkey";
     2304  group: tr("deprecated tagging");
     2305  set beam_pump_no_mech
     2306}
     2307*[pump:type]!.beam_pump_no_mech {
     2308  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2309  suggestAlternative: "pump_mechanism";
     2310  group: tr("deprecated tagging");
     2311}
     2312*[substance=heat] {
     2313  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2314  suggestAlternative: "substance=hot_water";
     2315  suggestAlternative: "substance=steam";
     2316  group: tr("deprecated tagging");
     2317}
     2318
    22802319/* #20959 */
    22812320*[landuse=school] {

  • trunk/resources/data/validator/ignoretags.cfg

    r18220 r18230  
    174174K:bicycle=dismount
    175175K:wall=no
    176 K:man_made=petroleum_well
    177176K:man_made=yes
    178177K:man_made=clearcut
    … …  
    705704E:role
    706705E:levels
     706K:man_made=pumping_rig
     707E:pump:type
     708K:substance=heat
    707709;
    708710; Tags not yet decided (to remove from this section when added or moved up when deprecated)

  • trunk/resources/images/presets/power/power_source-biofuel.svg

    r10918 r18230  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
    3 
    42<svg
    53   xmlns:dc="http://purl.org/dc/elements/1.1/"
    … …  
    86   xmlns:svg="http://www.w3.org/2000/svg"
    97   xmlns="http://www.w3.org/2000/svg"
    10    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    11    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    128   width="16"
    139   height="16"
    1410   id="svg2"
    15    sodipodi:version="0.32"
    16    inkscape:version="0.91 r13725"
    17    version="1.0"
    18    sodipodi:docname="power_source-gas.svg"
    19    inkscape:output_extension="org.inkscape.output.svg.inkscape">
     11   version="1.0">
     12  <defs
     13     id="defs183" />
    2014  <metadata
    2115     id="metadata10">
    … …  
    4135    </rdf:RDF>
    4236  </metadata>
    43   <sodipodi:namedview
    44      inkscape:window-height="1018"
    45      inkscape:window-width="1920"
    46      inkscape:pageshadow="2"
    47      inkscape:pageopacity="0.0"
    48      guidetolerance="10.0"
    49      gridtolerance="10.0"
    50      objecttolerance="10.0"
    51      borderopacity="1.0"
    52      bordercolor="#666666"
    53      pagecolor="#ffffff"
    54      id="base"
    55      showgrid="true"
    56      inkscape:zoom="32"
    57      inkscape:cx="6.9004192"
    58      inkscape:cy="10.644037"
    59      inkscape:window-x="-8"
    60      inkscape:window-y="-8"
    61      inkscape:current-layer="svg2"
    62      inkscape:window-maximized="1">
    63     <inkscape:grid
    64        type="xygrid"
    65        id="grid2383"
    66        visible="true"
    67        enabled="true" />
    68   </sodipodi:namedview>
    69   <sodipodi:namedview
    70      id="namedview10"
    71      pagecolor="#ffffff"
    72      bordercolor="#666666"
    73      borderopacity="1.0"
    74      inkscape:pageopacity="0.0"
    75      inkscape:pageshadow="2"
    76      inkscape:zoom="26.052568"
    77      inkscape:cx="9.9125234"
    78      inkscape:cy="9.2770693"
    79      inkscape:document-units="px"
    80      inkscape:current-layer="layer1"
    81      showgrid="true"
    82      inkscape:snap-bbox="true"
    83      inkscape:object-paths="true"
    84      inkscape:object-nodes="true"
    85      inkscape:bbox-paths="true"
    86      inkscape:bbox-nodes="true"
    87      gridtolerance="30"
    88      inkscape:window-width="1172"
    89      inkscape:window-height="805"
    90      inkscape:window-x="122"
    91      inkscape:window-y="11">
    92     <inkscape:grid
    93        type="xygrid"
    94        id="grid12"
    95        visible="true"
    96        enabled="true"
    97        spacingx="0.5px"
    98        spacingy="0.5px"
    99        empspacing="2" />
    100   </sodipodi:namedview>
    10137  <metadata
    10238     id="metadata7">
    … …  
    13672     id="rect2939" />
    13773  <path
    138      inkscape:connector-curvature="0"
    13974     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
    14075     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
    … …  
    16297     id="rect2949" />
    16398  <path
    164      inkscape:connector-curvature="0"
    16599     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
    166100     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"

  • trunk/resources/images/presets/power/power_source-coal.svg

    r10918 r18230  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
    3 
    42<svg
    53   xmlns:dc="http://purl.org/dc/elements/1.1/"
    … …  
    86   xmlns:svg="http://www.w3.org/2000/svg"
    97   xmlns="http://www.w3.org/2000/svg"
    10    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    11    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    128   width="16"
    139   height="16"
    1410   id="svg2"
    15    sodipodi:version="0.32"
    16    inkscape:version="0.91 r13725"
    17    version="1.0"
    18    sodipodi:docname="power_source-gas.svg"
    19    inkscape:output_extension="org.inkscape.output.svg.inkscape">
     11   version="1.0">
     12  <defs
     13     id="defs280" />
    2014  <metadata
    2115     id="metadata10">
    … …  
    4135    </rdf:RDF>
    4236  </metadata>
    43   <sodipodi:namedview
    44      inkscape:window-height="1018"
    45      inkscape:window-width="1920"
    46      inkscape:pageshadow="2"
    47      inkscape:pageopacity="0.0"
    48      guidetolerance="10.0"
    49      gridtolerance="10.0"
    50      objecttolerance="10.0"
    51      borderopacity="1.0"
    52      bordercolor="#666666"
    53      pagecolor="#ffffff"
    54      id="base"
    55      showgrid="true"
    56      inkscape:zoom="32"
    57      inkscape:cx="6.9004192"
    58      inkscape:cy="10.644037"
    59      inkscape:window-x="-8"
    60      inkscape:window-y="-8"
    61      inkscape:current-layer="svg2"
    62      inkscape:window-maximized="1">
    63     <inkscape:grid
    64        type="xygrid"
    65        id="grid2383"
    66        visible="true"
    67        enabled="true" />
    68   </sodipodi:namedview>
    69   <sodipodi:namedview
    70      id="namedview10"
    71      pagecolor="#ffffff"
    72      bordercolor="#666666"
    73      borderopacity="1.0"
    74      inkscape:pageopacity="0.0"
    75      inkscape:pageshadow="2"
    76      inkscape:zoom="26.052568"
    77      inkscape:cx="9.9125234"
    78      inkscape:cy="9.2770693"
    79      inkscape:document-units="px"
    80      inkscape:current-layer="layer1"
    81      showgrid="true"
    82      inkscape:snap-bbox="true"
    83      inkscape:object-paths="true"
    84      inkscape:object-nodes="true"
    85      inkscape:bbox-paths="true"
    86      inkscape:bbox-nodes="true"
    87      gridtolerance="30"
    88      inkscape:window-width="1172"
    89      inkscape:window-height="805"
    90      inkscape:window-x="122"
    91      inkscape:window-y="11">
    92     <inkscape:grid
    93        type="xygrid"
    94        id="grid12"
    95        visible="true"
    96        enabled="true"
    97        spacingx="0.5px"
    98        spacingy="0.5px"
    99        empspacing="2" />
    100   </sodipodi:namedview>
    10137  <metadata
    10238     id="metadata7">
    … …  
    13672     id="rect2939" />
    13773  <path
    138      inkscape:connector-curvature="0"
    13974     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
    14075     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
    … …  
    16297     id="rect2949" />
    16398  <path
    164      inkscape:connector-curvature="0"
    16599     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
    166100     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"

  • trunk/resources/images/presets/power/power_source-gas.svg

    r10918 r18230  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
    3 
    42<svg
    53   xmlns:dc="http://purl.org/dc/elements/1.1/"
    … …  
    86   xmlns:svg="http://www.w3.org/2000/svg"
    97   xmlns="http://www.w3.org/2000/svg"
    10    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    11    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    128   width="16"
    139   height="16"
    1410   id="svg2"
    15    sodipodi:version="0.32"
    16    inkscape:version="0.91 r13725"
    17    version="1.0"
    18    sodipodi:docname="power_source-gas.svg"
    19    inkscape:output_extension="org.inkscape.output.svg.inkscape">
     11   version="1.0">
     12  <defs
     13     id="defs212" />
    2014  <metadata
    2115     id="metadata10">
    … …  
    4135    </rdf:RDF>
    4236  </metadata>
    43   <sodipodi:namedview
    44      inkscape:window-height="1018"
    45      inkscape:window-width="1920"
    46      inkscape:pageshadow="2"
    47      inkscape:pageopacity="0.0"
    48      guidetolerance="10.0"
    49      gridtolerance="10.0"
    50      objecttolerance="10.0"
    51      borderopacity="1.0"
    52      bordercolor="#666666"
    53      pagecolor="#ffffff"
    54      id="base"
    55      showgrid="true"
    56      inkscape:zoom="32"
    57      inkscape:cx="6.9004192"
    58      inkscape:cy="10.644037"
    59      inkscape:window-x="-8"
    60      inkscape:window-y="-8"
    61      inkscape:current-layer="svg2"
    62      inkscape:window-maximized="1">
    63     <inkscape:grid
    64        type="xygrid"
    65        id="grid2383"
    66        visible="true"
    67        enabled="true" />
    68   </sodipodi:namedview>
    69   <sodipodi:namedview
    70      id="namedview10"
    71      pagecolor="#ffffff"
    72      bordercolor="#666666"
    73      borderopacity="1.0"
    74      inkscape:pageopacity="0.0"
    75      inkscape:pageshadow="2"
    76      inkscape:zoom="26.052568"
    77      inkscape:cx="9.9125234"
    78      inkscape:cy="9.2770693"
    79      inkscape:document-units="px"
    80      inkscape:current-layer="layer1"
    81      showgrid="true"
    82      inkscape:snap-bbox="true"
    83      inkscape:object-paths="true"
    84      inkscape:object-nodes="true"
    85      inkscape:bbox-paths="true"
    86      inkscape:bbox-nodes="true"
    87      gridtolerance="30"
    88      inkscape:window-width="1172"
    89      inkscape:window-height="805"
    90      inkscape:window-x="122"
    91      inkscape:window-y="11">
    92     <inkscape:grid
    93        type="xygrid"
    94        id="grid12"
    95        visible="true"
    96        enabled="true"
    97        spacingx="0.5px"
    98        spacingy="0.5px"
    99        empspacing="2" />
    100   </sodipodi:namedview>
    10137  <metadata
    10238     id="metadata7">
    … …  
    13672     id="rect2939" />
    13773  <path
    138      inkscape:connector-curvature="0"
    13974     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
    14075     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
    … …  
    16297     id="rect2949" />
    16398  <path
    164      inkscape:connector-curvature="0"
    16599     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
    166100     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"

  • trunk/resources/images/presets/power/power_source-geothermal.svg

    r13363 r18230  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
    3 
    42<svg
    53   xmlns:dc="http://purl.org/dc/elements/1.1/"
    … …  
    86   xmlns:svg="http://www.w3.org/2000/svg"
    97   xmlns="http://www.w3.org/2000/svg"
    10    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    11    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    128   width="16"
    139   height="16"
    1410   id="svg2"
    15    sodipodi:version="0.32"
    16    inkscape:version="0.91 r13725"
    17    version="1.0"
    18    sodipodi:docname="power_source-geothermal2.svg"
    19    inkscape:output_extension="org.inkscape.output.svg.inkscape">
     11   version="1.0">
    2012  <defs
    2113     id="defs14" />
    … …  
    4335    </rdf:RDF>
    4436  </metadata>
    45   <sodipodi:namedview
    46      inkscape:window-height="988"
    47      inkscape:window-width="1680"
    48      inkscape:pageshadow="2"
    49      inkscape:pageopacity="0.0"
    50      guidetolerance="10.0"
    51      gridtolerance="10.0"
    52      objecttolerance="10.0"
    53      borderopacity="1.0"
    54      bordercolor="#666666"
    55      pagecolor="#ffffff"
    56      id="base"
    57      showgrid="true"
    58      inkscape:zoom="33.37544"
    59      inkscape:cx="0.88431149"
    60      inkscape:cy="7.3901301"
    61      inkscape:window-x="-8"
    62      inkscape:window-y="-8"
    63      inkscape:window-maximized="1"
    64      inkscape:current-layer="svg2">
    65     <inkscape:grid
    66        type="xygrid"
    67        id="grid2383"
    68        visible="true"
    69        enabled="true" />
    70   </sodipodi:namedview>
    71   <sodipodi:namedview
    72      id="namedview10"
    73      pagecolor="#ffffff"
    74      bordercolor="#666666"
    75      borderopacity="1.0"
    76      inkscape:pageopacity="0.0"
    77      inkscape:pageshadow="2"
    78      inkscape:zoom="26.052568"
    79      inkscape:cx="9.9125234"
    80      inkscape:cy="9.2770693"
    81      inkscape:document-units="px"
    82      inkscape:current-layer="layer1"
    83      showgrid="true"
    84      inkscape:snap-bbox="true"
    85      inkscape:object-paths="true"
    86      inkscape:object-nodes="true"
    87      inkscape:bbox-paths="true"
    88      inkscape:bbox-nodes="true"
    89      gridtolerance="30"
    90      inkscape:window-width="1172"
    91      inkscape:window-height="805"
    92      inkscape:window-x="122"
    93      inkscape:window-y="11">
    94     <inkscape:grid
    95        type="xygrid"
    96        id="grid12"
    97        visible="true"
    98        enabled="true"
    99        spacingx="0.5px"
    100        spacingy="0.5px"
    101        empspacing="2" />
    102   </sodipodi:namedview>
    10337  <metadata
    10438     id="metadata7">
    … …  
    13771       id="path2959"
    13872       d="m 0.354,3.355 c 1,1 3.999,2.999 6.998,1 3,-2 6,0 6.999,1"
    139        style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    140        inkscape:connector-curvature="0" />
     73       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    14174    <path
    14275       id="path2961"
    14376       d="m 0.354,0.355 c 1,1.001 3.999,3 6.998,1.001 3,-2 6,0 6.999,0.999"
    144        style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    145        inkscape:connector-curvature="0" />
     77       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    14678    <path
    14779       id="path2963"
    14880       d="m 0.354,6.354 c 1,1.001 3.999,2.999 6.998,1.001 3,-2 6,0 6.999,0.999"
    149        style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    150        inkscape:connector-curvature="0" />
     81       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    15182  </g>
    15283</svg>

  • trunk/resources/images/presets/power/power_source-nuclear.svg

    r10918 r18230  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
    3 
    42<svg
    53   xmlns:dc="http://purl.org/dc/elements/1.1/"
    … …  
    86   xmlns:svg="http://www.w3.org/2000/svg"
    97   xmlns="http://www.w3.org/2000/svg"
    10    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    11    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    128   width="16"
    139   height="16"
    1410   id="svg2"
    15    sodipodi:version="0.32"
    16    inkscape:version="0.91 r13725"
    17    version="1.0"
    18    sodipodi:docname="power_source-nuclear.svg"
    19    inkscape:output_extension="org.inkscape.output.svg.inkscape">
     11   version="1.0">
    2012  <defs
    2113     id="defs15" />
    … …  
    4335    </rdf:RDF>
    4436  </metadata>
    45   <sodipodi:namedview
    46      inkscape:window-height="988"
    47      inkscape:window-width="1680"
    48      inkscape:pageshadow="2"
    49      inkscape:pageopacity="0.0"
    50      guidetolerance="10.0"
    51      gridtolerance="10.0"
    52      objecttolerance="10.0"
    53      borderopacity="1.0"
    54      bordercolor="#666666"
    55      pagecolor="#ffffff"
    56      id="base"
    57      showgrid="true"
    58      inkscape:zoom="33.37544"
    59      inkscape:cx="6.6382163"
    60      inkscape:cy="6.2111108"
    61      inkscape:window-x="-8"
    62      inkscape:window-y="-8"
    63      inkscape:window-maximized="1"
    64      inkscape:current-layer="svg2">
    65     <inkscape:grid
    66        type="xygrid"
    67        id="grid2383"
    68        visible="true"
    69        enabled="true" />
    70   </sodipodi:namedview>
    71   <sodipodi:namedview
    72      id="namedview10"
    73      pagecolor="#ffffff"
    74      bordercolor="#666666"
    75      borderopacity="1.0"
    76      inkscape:pageopacity="0.0"
    77      inkscape:pageshadow="2"
    78      inkscape:zoom="26.052568"
    79      inkscape:cx="9.9125234"
    80      inkscape:cy="9.2770693"
    81      inkscape:document-units="px"
    82      inkscape:current-layer="layer1"
    83      showgrid="true"
    84      inkscape:snap-bbox="true"
    85      inkscape:object-paths="true"
    86      inkscape:object-nodes="true"
    87      inkscape:bbox-paths="true"
    88      inkscape:bbox-nodes="true"
    89      gridtolerance="30"
    90      inkscape:window-width="1172"
    91      inkscape:window-height="805"
    92      inkscape:window-x="122"
    93      inkscape:window-y="11">
    94     <inkscape:grid
    95        type="xygrid"
    96        id="grid12"
    97        visible="true"
    98        enabled="true"
    99        spacingx="0.5px"
    100        spacingy="0.5px"
    101        empspacing="2" />
    102   </sodipodi:namedview>
    10337  <metadata
    10438     id="metadata7">
    … …  
    13771       id="path4369"
    13872       d="m 14,3.074 -2.5,4.33 C 12.396,7.922 13.001,8.889 13.001,10 L 18,10 C 18,7.041 16.39,4.457 14,3.074 Z"
    139        style="fill:#000000"
    140        inkscape:connector-curvature="0" />
     73       style="fill:#000000" />
    14174    <path
    14275       id="path4371"
    14376       d="m 2.006,10 4.999,0 C 7.005,8.964 7.54,7.957 8.501,7.402 L 6.002,3.072 C 3.441,4.552 2.008,7.238 2.006,10 Z"
    144        style="fill:#000000"
    145        inkscape:connector-curvature="0" />
     77       style="fill:#000000" />
    14678    <path
    14779       id="path4373"
    14880       d="m 14,16.925 -2.5,-4.329 c -0.897,0.516 -2.037,0.556 -2.998,10e-4 l -2.499,4.328 c 2.562,1.481 5.604,1.377 7.997,0 z"
    149        style="fill:#000000"
    150        inkscape:connector-curvature="0" />
     81       style="fill:#000000" />
    15182    <circle
    15283       id="path4395"

  • trunk/resources/images/presets/power/power_source-oil.svg

    r10918 r18230  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
    3 
    42<svg
    53   xmlns:dc="http://purl.org/dc/elements/1.1/"
    … …  
    86   xmlns:svg="http://www.w3.org/2000/svg"
    97   xmlns="http://www.w3.org/2000/svg"
    10    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    11    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    128   width="16"
    139   height="16"
    1410   id="svg2"
    15    sodipodi:version="0.32"
    16    inkscape:version="0.91 r13725"
    17    version="1.0"
    18    sodipodi:docname="power_source-gas.svg"
    19    inkscape:output_extension="org.inkscape.output.svg.inkscape">
     11   version="1.0">
     12  <defs
     13     id="defs115" />
    2014  <metadata
    2115     id="metadata10">
    … …  
    4135    </rdf:RDF>
    4236  </metadata>
    43   <sodipodi:namedview
    44      inkscape:window-height="1018"
    45      inkscape:window-width="1920"
    46      inkscape:pageshadow="2"
    47      inkscape:pageopacity="0.0"
    48      guidetolerance="10.0"
    49      gridtolerance="10.0"
    50      objecttolerance="10.0"
    51      borderopacity="1.0"
    52      bordercolor="#666666"
    53      pagecolor="#ffffff"
    54      id="base"
    55      showgrid="true"
    56      inkscape:zoom="32"
    57      inkscape:cx="6.9004192"
    58      inkscape:cy="10.644037"
    59      inkscape:window-x="-8"
    60      inkscape:window-y="-8"
    61      inkscape:current-layer="svg2"
    62      inkscape:window-maximized="1">
    63     <inkscape:grid
    64        type="xygrid"
    65        id="grid2383"
    66        visible="true"
    67        enabled="true" />
    68   </sodipodi:namedview>
    69   <sodipodi:namedview
    70      id="namedview10"
    71      pagecolor="#ffffff"
    72      bordercolor="#666666"
    73      borderopacity="1.0"
    74      inkscape:pageopacity="0.0"
    75      inkscape:pageshadow="2"
    76      inkscape:zoom="26.052568"
    77      inkscape:cx="9.9125234"
    78      inkscape:cy="9.2770693"
    79      inkscape:document-units="px"
    80      inkscape:current-layer="layer1"
    81      showgrid="true"
    82      inkscape:snap-bbox="true"
    83      inkscape:object-paths="true"
    84      inkscape:object-nodes="true"
    85      inkscape:bbox-paths="true"
    86      inkscape:bbox-nodes="true"
    87      gridtolerance="30"
    88      inkscape:window-width="1172"
    89      inkscape:window-height="805"
    90      inkscape:window-x="122"
    91      inkscape:window-y="11">
    92     <inkscape:grid
    93        type="xygrid"
    94        id="grid12"
    95        visible="true"
    96        enabled="true"
    97        spacingx="0.5px"
    98        spacingy="0.5px"
    99        empspacing="2" />
    100   </sodipodi:namedview>
    10137  <metadata
    10238     id="metadata7">
    … …  
    12258  </metadata>
    12359  <ellipse
    124      style="fill:#708090;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-opacity:1"
     60     style="fill:#708090;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-opacity:1"
    12561     id="background"
    12662     cx="8"
    … …  
    13672     id="rect2939" />
    13773  <path
    138      inkscape:connector-curvature="0"
    13974     style="fill:none;stroke:#000000;stroke-width:0.80864745;stroke-opacity:1"
    14075     d="m 5.9796932,4.5406871 c 0,0 0,-1.6020611 1.6326736,-1.6020611 1.6326736,0 1.6326736,-1.6020611 1.6326736,-1.6020611"
    … …  
    16297     id="rect2949" />
    16398  <path
    164      inkscape:connector-curvature="0"
    16599     style="fill:none;stroke:#000000;stroke-width:0.69512463;stroke-opacity:1"
    166100     d="m 9.06003,5.2659558 c 0,0 0,-1.3571756 1.424129,-1.3571756 1.424129,0 1.424129,-1.3571757 1.424129,-1.3571757"

  • trunk/resources/images/presets/power/power_source-sun.svg

    r10918 r18230  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
    3 
    42<svg
    53   xmlns:dc="http://purl.org/dc/elements/1.1/"
    … …  
    86   xmlns:svg="http://www.w3.org/2000/svg"
    97   xmlns="http://www.w3.org/2000/svg"
    10    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    11    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    128   width="16"
    139   height="16"
    1410   id="svg2"
    15    sodipodi:version="0.32"
    16    inkscape:version="0.91 r13725"
    17    version="1.0"
    18    sodipodi:docname="power_source-sun5.svg"
    19    inkscape:output_extension="org.inkscape.output.svg.inkscape">
     11   version="1.0">
    2012  <defs
    2113     id="defs18" />
    … …  
    4335    </rdf:RDF>
    4436  </metadata>
    45   <sodipodi:namedview
    46      inkscape:window-height="988"
    47      inkscape:window-width="1680"
    48      inkscape:pageshadow="2"
    49      inkscape:pageopacity="0.0"
    50      guidetolerance="10.0"
    51      gridtolerance="10.0"
    52      objecttolerance="10.0"
    53      borderopacity="1.0"
    54      bordercolor="#666666"
    55      pagecolor="#ffffff"
    56      id="base"
    57      showgrid="true"
    58      inkscape:zoom="23.6"
    59      inkscape:cx="8.6883174"
    60      inkscape:cy="3.5715644"
    61      inkscape:window-x="-8"
    62      inkscape:window-y="-8"
    63      inkscape:window-maximized="1"
    64      inkscape:current-layer="svg2">
    65     <inkscape:grid
    66        type="xygrid"
    67        id="grid2383"
    68        visible="true"
    69        enabled="true" />
    70   </sodipodi:namedview>
    71   <sodipodi:namedview
    72      id="namedview10"
    73      pagecolor="#ffffff"
    74      bordercolor="#666666"
    75      borderopacity="1.0"
    76      inkscape:pageopacity="0.0"
    77      inkscape:pageshadow="2"
    78      inkscape:zoom="26.052568"
    79      inkscape:cx="9.9125234"
    80      inkscape:cy="9.2770693"
    81      inkscape:document-units="px"
    82      inkscape:current-layer="layer1"
    83      showgrid="true"
    84      inkscape:snap-bbox="true"
    85      inkscape:object-paths="true"
    86      inkscape:object-nodes="true"
    87      inkscape:bbox-paths="true"
    88      inkscape:bbox-nodes="true"
    89      gridtolerance="30"
    90      inkscape:window-width="1172"
    91      inkscape:window-height="805"
    92      inkscape:window-x="122"
    93      inkscape:window-y="11">
    94     <inkscape:grid
    95        type="xygrid"
    96        id="grid12"
    97        visible="true"
    98        enabled="true"
    99        spacingx="0.5px"
    100        spacingy="0.5px"
    101        empspacing="2" />
    102   </sodipodi:namedview>
    10337  <metadata
    10438     id="metadata7">
    … …  
    12458  </metadata>
    12559  <ellipse
    126      style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.74915254;stroke-opacity:1"
    127      id="background"
    128      cx="7.4915257"
    129      cy="8.5084743"
    130      rx="7.1169496"
    131      ry="7.1169491" />
    132   <rect
    133      style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
    134      id="rect4146"
    135      width="1"
    136      height="11"
    137      x="-1.2071068"
    138      y="5.8137083"
    139      transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
    140      ry="0.5" />
    141   <rect
    142      style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
    143      id="rect4148"
    144      width="11"
    145      height="1"
    146      x="-6.2071066"
    147      y="10.813708"
    148      transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
    149      ry="0.5" />
    150   <rect
    151      style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
    152      id="rect4154"
    153      width="11"
    154      height="1"
    155      x="2"
    156      y="8"
    157      ry="0.5" />
    158   <rect
    159      style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
    160      id="rect4156"
    161      width="0.99999952"
    162      height="11.000003"
    163      x="7"
    164      y="3"
    165      ry="0.49999976" />
    166   <circle
    167      id="circle4170"
    168      cy="8.5"
    169      cx="7.5"
    170      style="fill:#000000;stroke:none;stroke-width:0.99980003"
    171      r="2.5" />
    172   <circle
    173      cy="8.5"
    174      cx="7.5"
    175      style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-opacity:1"
    176      id="circle4172"
    177      r="1.5" />
     60     style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     61     id="background-6"
     62     cx="8"
     63     cy="8"
     64     rx="7.6000004"
     65     ry="7.5999999" />
     66  <g
     67     id="g983"
     68     transform="translate(0.5,-0.50000143)">
     69    <circle
     70       id="circle4170"
     71       cy="8.5"
     72       cx="7.5"
     73       style="fill:#000000;stroke:none;stroke-width:0.9998"
     74       r="2.5" />
     75    <rect
     76       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     77       id="rect4146"
     78       width="1"
     79       height="11"
     80       x="-1.2071068"
     81       y="5.8137083"
     82       transform="rotate(-45)"
     83       ry="0.5" />
     84    <rect
     85       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     86       id="rect4148"
     87       width="11"
     88       height="1"
     89       x="-6.2071066"
     90       y="10.813708"
     91       transform="rotate(-45)"
     92       ry="0.5" />
     93    <rect
     94       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     95       id="rect4154"
     96       width="11"
     97       height="1"
     98       x="2"
     99       y="8"
     100       ry="0.5" />
     101    <rect
     102       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     103       id="rect4156"
     104       width="1"
     105       height="11"
     106       x="7"
     107       y="3"
     108       ry="0.5" />
     109    <circle
     110       cy="8.5"
     111       cx="7.5"
     112       style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-opacity:1"
     113       id="circle4172"
     114       r="1.5" />
     115  </g>
    178116</svg>

  • trunk/resources/images/presets/power/power_source-water.svg

    r10918 r18230  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
    3 
    42<svg
    53   xmlns:dc="http://purl.org/dc/elements/1.1/"
    … …  
    86   xmlns:svg="http://www.w3.org/2000/svg"
    97   xmlns="http://www.w3.org/2000/svg"
    10    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    11    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    128   width="16"
    139   height="16"
    1410   id="svg2"
    15    sodipodi:version="0.32"
    16    inkscape:version="0.91 r13725"
    17    version="1.0"
    18    sodipodi:docname="power_source-geothermal2.svg"
    19    inkscape:output_extension="org.inkscape.output.svg.inkscape">
     11   version="1.0">
    2012  <defs
    2113     id="defs14" />
    … …  
    4335    </rdf:RDF>
    4436  </metadata>
    45   <sodipodi:namedview
    46      inkscape:window-height="988"
    47      inkscape:window-width="1680"
    48      inkscape:pageshadow="2"
    49      inkscape:pageopacity="0.0"
    50      guidetolerance="10.0"
    51      gridtolerance="10.0"
    52      objecttolerance="10.0"
    53      borderopacity="1.0"
    54      bordercolor="#666666"
    55      pagecolor="#ffffff"
    56      id="base"
    57      showgrid="true"
    58      inkscape:zoom="33.37544"
    59      inkscape:cx="0.88431149"
    60      inkscape:cy="7.3901301"
    61      inkscape:window-x="-8"
    62      inkscape:window-y="-8"
    63      inkscape:window-maximized="1"
    64      inkscape:current-layer="svg2">
    65     <inkscape:grid
    66        type="xygrid"
    67        id="grid2383"
    68        visible="true"
    69        enabled="true" />
    70   </sodipodi:namedview>
    71   <sodipodi:namedview
    72      id="namedview10"
    73      pagecolor="#ffffff"
    74      bordercolor="#666666"
    75      borderopacity="1.0"
    76      inkscape:pageopacity="0.0"
    77      inkscape:pageshadow="2"
    78      inkscape:zoom="26.052568"
    79      inkscape:cx="9.9125234"
    80      inkscape:cy="9.2770693"
    81      inkscape:document-units="px"
    82      inkscape:current-layer="layer1"
    83      showgrid="true"
    84      inkscape:snap-bbox="true"
    85      inkscape:object-paths="true"
    86      inkscape:object-nodes="true"
    87      inkscape:bbox-paths="true"
    88      inkscape:bbox-nodes="true"
    89      gridtolerance="30"
    90      inkscape:window-width="1172"
    91      inkscape:window-height="805"
    92      inkscape:window-x="122"
    93      inkscape:window-y="11">
    94     <inkscape:grid
    95        type="xygrid"
    96        id="grid12"
    97        visible="true"
    98        enabled="true"
    99        spacingx="0.5px"
    100        spacingy="0.5px"
    101        empspacing="2" />
    102   </sodipodi:namedview>
    10337  <metadata
    10438     id="metadata7">
    … …  
    12458  </metadata>
    12559  <ellipse
    126      style="fill:#00ffff;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     60     style="fill:#2090cf;fill-opacity:1;stroke:#000000;stroke-width:0.80000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    12761     id="background"
    12862     cx="8"
    … …  
    13771       id="path2959"
    13872       d="m 0.354,3.355 c 1,1 3.999,2.999 6.998,1 3,-2 6,0 6.999,1"
    139        style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    140        inkscape:connector-curvature="0" />
     73       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    14174    <path
    14275       id="path2961"
    14376       d="m 0.354,0.355 c 1,1.001 3.999,3 6.998,1.001 3,-2 6,0 6.999,0.999"
    144        style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    145        inkscape:connector-curvature="0" />
     77       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    14678    <path
    14779       id="path2963"
    14880       d="m 0.354,6.354 c 1,1.001 3.999,2.999 6.998,1.001 3,-2 6,0 6.999,0.999"
    149        style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    150        inkscape:connector-curvature="0" />
     81       style="fill:none;stroke:#000000;stroke-width:1.32312033;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    15182  </g>
    15283</svg>

  • trunk/resources/images/presets/power/power_source-wind.svg

    r10918 r18230  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
    3 
    42<svg
    53   xmlns:dc="http://purl.org/dc/elements/1.1/"
    … …  
    86   xmlns:svg="http://www.w3.org/2000/svg"
    97   xmlns="http://www.w3.org/2000/svg"
    10    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    11    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    128   width="16"
    139   height="16"
    1410   id="svg2"
    15    sodipodi:version="0.32"
    16    inkscape:version="0.91 r13725"
    17    version="1.0"
    18    sodipodi:docname="power_source-wind3.svg"
    19    inkscape:output_extension="org.inkscape.output.svg.inkscape">
     11   version="1.0">
    2012  <defs
    2113     id="defs15" />
    … …  
    4335    </rdf:RDF>
    4436  </metadata>
    45   <sodipodi:namedview
    46      inkscape:window-height="988"
    47      inkscape:window-width="1680"
    48      inkscape:pageshadow="2"
    49      inkscape:pageopacity="0.0"
    50      guidetolerance="10.0"
    51      gridtolerance="10.0"
    52      objecttolerance="10.0"
    53      borderopacity="1.0"
    54      bordercolor="#666666"
    55      pagecolor="#ffffff"
    56      id="base"
    57      showgrid="true"
    58      inkscape:zoom="47.2"
    59      inkscape:cx="8.3885021"
    60      inkscape:cy="7.9297332"
    61      inkscape:window-x="-8"
    62      inkscape:window-y="-8"
    63      inkscape:window-maximized="1"
    64      inkscape:current-layer="svg2">
    65     <inkscape:grid
    66        type="xygrid"
    67        id="grid2383"
    68        visible="true"
    69        enabled="true" />
    70   </sodipodi:namedview>
    71   <sodipodi:namedview
    72      id="namedview10"
    73      pagecolor="#ffffff"
    74      bordercolor="#666666"
    75      borderopacity="1.0"
    76      inkscape:pageopacity="0.0"
    77      inkscape:pageshadow="2"
    78      inkscape:zoom="26.052568"
    79      inkscape:cx="9.9125234"
    80      inkscape:cy="9.2770693"
    81      inkscape:document-units="px"
    82      inkscape:current-layer="layer1"
    83      showgrid="true"
    84      inkscape:snap-bbox="true"
    85      inkscape:object-paths="true"
    86      inkscape:object-nodes="true"
    87      inkscape:bbox-paths="true"
    88      inkscape:bbox-nodes="true"
    89      gridtolerance="30"
    90      inkscape:window-width="1172"
    91      inkscape:window-height="805"
    92      inkscape:window-x="122"
    93      inkscape:window-y="11">
    94     <inkscape:grid
    95        type="xygrid"
    96        id="grid12"
    97        visible="true"
    98        enabled="true"
    99        spacingx="0.5px"
    100        spacingy="0.5px"
    101        empspacing="2" />
    102   </sodipodi:namedview>
    10337  <metadata
    10438     id="metadata7">
    … …  
    16397       id="path3846"
    16498       d="m 9,18 2,0 0,-6 -1,-0.5 -1,0.5 0,6 z"
    165        style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    166        inkscape:connector-curvature="0" />
     99       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
    167100  </g>
    168101</svg>

  • trunk/resources/styles/standard/elemstyles.mapcss

    r18094 r18230  
    15531553    color: pipeline#660000;
    15541554}
     1555area[man_made=petroleum_well],
     1556area[man_made=pump],
    15551557area[pipeline=substation] {
    15561558    fill-color: pipeline_substation#eeeeee;
    … …  
    15701572node[man_made=manhole] {
    15711573    icon-image: "presets/misc/manhole.svg";
     1574    set icon_z17;
     1575}
     1576node[man_made=petroleum_well] {
     1577    icon-image: "presets/landmark/petroleum_well.svg";
     1578    set icon_z17;
     1579}
     1580node[man_made=petroleum_well][substance=gas] {
     1581    icon-image: "presets/landmark/gas_well.svg";
     1582    set icon_z17;
     1583}
     1584node[man_made=petroleum_well][substance=oil] {
     1585    icon-image: "presets/landmark/oil_well.svg";
     1586    set icon_z17;
     1587}
     1588node[man_made=petroleum_well][mechanical_coupling=nodding_donkey] {
     1589    icon-image: "presets/landmark/well_donkey.svg";
     1590    set icon_z17;
     1591}
     1592node[man_made=petroleum_well][mechanical_coupling=nodding_donkey][substance=gas] {
     1593    icon-image: "presets/landmark/gas_well_donkey.svg";
     1594    set icon_z17;
     1595}
     1596node[man_made=petroleum_well][mechanical_coupling=nodding_donkey][substance=oil] {
     1597    icon-image: "presets/landmark/oil_well_donkey.svg";
     1598    set icon_z17;
     1599}
     1600node[man_made=pump] {
     1601    icon-image: "presets/landmark/pump.svg";
     1602    set icon_z17;
     1603}
     1604node[man_made=pump][substance=gas] {
     1605    icon-image: "presets/landmark/pump_gas.svg";
     1606    set icon_z17;
     1607}
     1608node[man_made=pump][substance=oil] {
     1609    icon-image: "presets/landmark/pump_oil.svg";
     1610    set icon_z17;
     1611}
     1612node[man_made=pump][substance=sewage] {
     1613    icon-image: "presets/landmark/pump_sewage.svg";
     1614    set icon_z17;
     1615}
     1616node[man_made=pump][substance=steam] {
     1617    icon-image: "presets/landmark/pump_steam.svg";
     1618    set icon_z17;
     1619}
     1620node[man_made=pump][substance=~/(^|_)?water$/] {
     1621    icon-image: "presets/landmark/pump_water.svg";
    15721622    set icon_z17;
    15731623}
    … …  
    15751625node[man_made=groyne],
    15761626node[man_made=embankment],
     1627node[man_made=pumping_rig],
    15771628node[man_made=pipeline] {
    15781629    icon-image: "presets/misc/deprecated.svg";
    1579     set icon_z17;
    1580 }
    1581 node[man_made=petroleum_well][!is_prop_set(icon-image)] {
    1582     icon-image: "presets/misc/no_icon.svg";
    15831630    set icon_z17;
    15841631}
    … …  
    15881635area[man_made=water_well],
    15891636area[man_made=windmill],
     1637area[man_made=windpump],
    15901638area[man_made=works],
    15911639area[man_made=water_works] {
    … …  
    16161664    set icon_z17;
    16171665}
     1666node[man_made=water_well][mechanical_coupling=nodding_donkey] {
     1667    icon-image: "presets/landmark/water_well_donkey.svg";
     1668    set icon_z17;
     1669}
    16181670node[man_made=windmill] {
    16191671    icon-image: "presets/landmark/windmill.svg";
     1672    set icon_z17;
     1673}
     1674node[man_made=windpump] {
     1675    icon-image: "presets/landmark/windpump.svg";
     1676    set icon_z17;
     1677}
     1678node[man_made=windpump][substance=gas] {
     1679    icon-image: "presets/landmark/windpump_gas.svg";
     1680    set icon_z17;
     1681}
     1682node[man_made=windpump][substance=oil] {
     1683    icon-image: "presets/landmark/windpump_oil.svg";
     1684    set icon_z17;
     1685}
     1686node[man_made=windpump][substance=sewage] {
     1687    icon-image: "presets/landmark/windpump_sewage.svg";
     1688    set icon_z17;
     1689}
     1690node[man_made=windpump][substance=steam] {
     1691    icon-image: "presets/landmark/windpump_steam.svg";
    16201692    set icon_z17;
    16211693}
Note: See TracChangeset for help on using the changeset viewer.