Changeset 16748 in josm

Timestamp:

2020-07-11T18:25:10+02:00 (4 years ago)

Author:

Klumbumbus

Message:

fix #9164 - Add more historic presets (patch by hiddewie, modified)

• historic=citywalls (internal icon reused)
• historic=city_gate (icon ​https://wiki.openstreetmap.org/wiki/File%3ACity-gate-14.svg, color changed, PD and CC0 licensed)
• historic=manor (icon from ​https://wiki.openstreetmap.org/wiki/File:Manor-14.svg, PD and CC0 licensed)
• historic=church (icon derived from internal icon, PD and CC0 licensed)
• historic=charcoal_pile (icon derived from internal icon, PD and CC0 licensed)
• historic=mine (icon derived from internal icon, PD and CC0 licensed)
• historic=mine_shaft (icon derived from internal icon, PD and CC0 licensed)
• historic=shieling (icon derived from internal icon, PD and CC0 licensed)
• historic=milestone (icon self created, PD and CC0 licensed)

Location:

trunk/resources

Files:

• data/defaultpresets.xml (modified) (2 diffs)
• data/validator/ignoretags.cfg (modified) (5 diffs)
• images/presets/landmark/historic_mine.svg (added)
• images/presets/landmark/milestone.svg (added)
• images/presets/landmark/mine.svg (modified) (3 diffs)
• images/presets/landmark/shieling.svg (added)
• images/presets/misc/charcoal_pile.svg (added)
• images/presets/religion/historic_church.svg (added)
• images/presets/sightseeing/city_gate.svg (added)
• images/presets/sightseeing/manor.svg (added)
• styles/standard/elemstyles.mapcss (modified) (3 diffs)

trunk/resources/data/defaultpresets.xml

@@ -6125 +6125 @@
             <text key="name" text="Name" />
         </item> <!-- Palaeontological Site -->
+        <item name="Citywalls" type="way,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:historic=citywalls" />
+            <space />
+            <key key="historic" value="citywalls" />
+            <optional>
+                <text key="name" text="Name" />
+            </optional>
+        </item> <!-- Citywalls -->
+        <item name="City gate" icon="presets/sightseeing/city_gate.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:historic=city_gate" />
+            <space />
+            <key key="historic" value="city_gate" />
+            <optional>
+                <text key="name" text="Name" />
+            </optional>
+        </item> <!-- City gate -->
+        <item name="Manor" icon="presets/sightseeing/manor.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:historic=manor" />
+            <space />
+            <key key="historic" value="manor" />
+            <optional>
+                <text key="name" text="Name" />
+            </optional>
+        </item> <!-- Manor -->
+        <item name="Church" icon="presets/religion/historic_church.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:historic=church" />
+            <space />
+            <key key="historic" value="church" />
+            <optional>
+                <text key="name" text="Name" />
+            </optional>
+            <reference ref="religious"/>
+        </item> <!-- Church -->
+        <separator/>
+        <item name="Charcoal pile" image="presets/misc/charcoal_pile.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:historic=charcoal_pile" />
+            <space />
+            <key key="historic" value="charcoal_pile" />
+            <optional>
+                <text key="name" text="Name" />
+            </optional>
+        </item> <!-- Charcoal pile -->
+        <item name="Mine" image="presets/landmark/historic_mine.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
+            <link wiki="Tag:historic=mine" />
+            <space />
+            <key key="historic" value="mine" />
+            <optional>
+                <text key="name" text="Name" />
+                <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
+            </optional>
+        </item> <!-- Mine -->
+        <item name="Mine shaft" image="presets/landmark/historic_mine.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:historic=mine_shaft" />
+            <space />
+            <key key="historic" value="mine_shaft" />
+            <optional>
+                <text key="name" text="Name" />
+            </optional>
+        </item> <!-- Mine shaft -->
+        <item name="Shieling" image="presets/landmark/shieling.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:historic=shieling" />
+            <space />
+            <key key="historic" value="shieling" />
+            <optional>
+                <text key="name" text="Name" />
+            </optional>
+        </item> <!-- Shieling -->
         <separator/>
         <item name="Grave" icon="presets/misc/grave.svg" type="node,closedway" preset_name_label="true">
@@ -6186 +6253 @@
             <text key="name" text="Name" />
         </item> <!-- Boundary Stone -->
+        <item name="Milestone" icon="presets/landmark/milestone.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:historic=milestone" />
+            <space />
+            <key key="historic" value="milestone" />
+            <optional>
+                <text key="name" text="Name" />
+            </optional>
+        </item> <!-- Milestone -->
     </group> <!-- Historic Places -->
   </group> <!-- Man Made -->

trunk/resources/data/validator/ignoretags.cfg

@@ -169 +169 @@
 K:type=is_in
 K:type=benchmark
-K:noref=yes
 K:bridge=swing
 K:residential=rural
@@ -264 +263 @@
 K:historic=building
 K:historic=wreck
-K:historic=charcoal_pile
 K:historic=heritage
 ;
@@ -274 +272 @@
 ; Lifecycle Tags
 ;
-;K:historic=yes
 K:planned=yes
 K:construction=yes
-;K:disused=yes
 K:abandoned=yes
 K:removed=yes
@@ -360 +356 @@
 ;
 K:sport=boxing
-K:sport=curling
 K:sport=netball
 K:sport=cliff_diving
@@ -407 +402 @@
 K:indoor=corridor
 K:highway=corridor
-K:historic=citywalls
 K:crossing=zebra
 K:healthcare=dentist

trunk/resources/images/presets/landmark/mine.svg

@@ -15 +15 @@
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="mine.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="historic_mine.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <metadata
@@ -42 +42 @@
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="988"
-     inkscape:window-width="1680"
+     inkscape:window-height="1016"
+     inkscape:window-width="1868"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -54 +54 @@
      id="base"
      inkscape:zoom="0.87674419"
-     inkscape:cx="20.530505"
-     inkscape:cy="213.85942"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
+     inkscape:cx="-143.86929"
+     inkscape:cy="209.29709"
+     inkscape:window-x="52"
+     inkscape:window-y="27"
      inkscape:current-layer="svg2"
      showgrid="false"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true" />
   <defs
      id="defs4" />
-  <rect
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.60000002;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
-     id="rect4133"
-     width="430"
-     height="430"
-     x="0"
-     y="-4.9960036e-015" />
   <path
-     d="M 90.99997,385.61425 C 76.28281,380.5685 74.6516,379.13624 71.50838,368.49999 C 68.56032,358.52412 68.56171,357.13217 71.52034,356.5208 C 73.21478,356.17066 90.71541,338.46781 124.92406,302.49999 C 152.90991,273.07499 179.38947,245.33909 183.76755,240.86465 C 189.73363,234.76725 191.51128,232.34851 190.86383,231.20917 C 189.03292,227.98729 112.69583,147.78913 110.7488,147.04198 C 109.99268,146.75183 107.99981,147.97368 106.32019,149.75721 C 102.45213,153.86459 83.49183,179.15596 72.02799,195.49999 C 67.20581,202.37499 62.71192,207.94959 62.04156,207.888 C 61.37121,207.8264 51.29305,200.1764 39.64565,190.888 L 18.46857,173.99999 L 21.30869,171.49999 C 22.87076,170.12499 28.60027,162.47499 34.04094,154.49999 C 49.87877,131.28472 67.28445,108.63548 75.95969,99.95299 C 87.69483,88.20805 153.57535,39.49999 157.72593,39.49999 C 158.79371,39.49999 164.74554,46.38406 173.22951,57.43189 C 182.63996,69.68619 187.89923,75.69546 189.84016,76.41131 C 191.40227,76.98745 192.52727,77.88552 192.34016,78.40703 C 192.15306,78.92854 181.87497,86.97932 169.49997,96.29765 C 157.12497,105.61597 143.76138,116.24354 139.8031,119.91447 C 129.41402,129.54935 128.93314,128.3951 153.70152,153.27489 C 178.56659,178.2518 240.5476,238.33592 301.99997,297.03474 C 327.29997,321.20111 351.18404,344.01703 355.07568,347.73679 C 359.62155,352.08188 362.97485,354.49999 364.45451,354.49999 C 366.65347,354.49999 366.72626,354.73647 366.06399,359.72893 C 364.95732,368.07141 361.50493,375.58925 357.5628,378.24093 C 353.85538,380.73472 346.71808,383.01724 339.45908,384.03051 L 334.91819,384.66436 L 275.54278,321.05428 C 242.88631,286.06873 215.85831,257.56924 215.48056,257.72209 C 215.10281,257.87493 190.37558,285.67499 160.53115,319.49999 C 130.68673,353.32499 104.63313,382.65533 102.63427,384.67851 L 98.99997,388.35704 L 90.99997,385.61425 z M 226.062,220.20497 L 214.12403,208.91143 L 250.14533,171.12282 C 280.54977,139.22665 286.16664,132.88172 286.16664,130.43241 C 286.16664,127.92877 282.76007,124.35824 261.3393,104.4101 C 247.68427,91.69382 236.76083,80.88693 237.06499,80.39479 C 237.36915,79.90265 238.53459,79.49999 239.65487,79.49999 C 240.92465,79.49999 248.40919,73.09778 259.52883,62.49999 C 269.33924,53.14999 277.84725,45.49999 278.43552,45.49999 C 279.02379,45.49999 289.66833,55.39999 302.09004,67.49999 C 325.64913,90.44892 327.29856,91.59 330.99997,87.49999 C 331.99546,86.39999 333.5277,85.50591 334.40496,85.51314 C 335.28221,85.52037 339.14474,88.19986 342.98834,91.46756 C 347.44836,95.25931 351.04777,97.51577 352.93711,97.70441 L 355.89752,97.99999 L 352.56336,101.7862 C 350.72957,103.86862 349.0756,106.89157 348.88788,108.50387 C 348.58682,111.08954 349.50487,112.26478 356.67119,118.46765 C 361.13973,122.33544 365.29175,125.50435 365.89789,125.50968 C 366.89652,125.51847 411.50902,211.55144 410.91976,212.3321 C 410.78188,212.51477 393.64353,203.58156 372.83452,192.48054 L 334.99997,172.29686 L 323.48495,160.89843 C 317.15169,154.62929 311.68592,149.49999 311.33879,149.49999 C 310.99166,149.49999 294.41419,167.94999 274.49997,190.49999 C 254.58575,213.04999 238.22653,231.49966 238.14614,231.49925 C 238.06574,231.49885 232.62788,226.41642 226.062,220.20497 z "
-     style="fill:black;fill-opacity:1"
-     id="path1935" />
+     inkscape:connector-curvature="0"
+     d="m 102.25974,377.26295 c -14.031744,-4.81075 -15.586986,-6.17631 -18.583819,-16.3172 -2.810762,-9.51128 -2.809437,-10.8384 0.01144,-11.42131 1.615526,-0.33382 18.301109,-17.21221 50.916589,-51.50493 26.68249,-28.05462 51.92883,-54.4988 56.10301,-58.76485 5.68824,-5.81343 7.38309,-8.11953 6.7658,-9.20581 -1.74565,-3.07182 -74.52754,-79.53498 -76.38391,-80.24733 -0.7209,-0.27663 -2.62095,0.8883 -4.22235,2.58877 -3.68792,3.9161 -21.765187,28.02959 -32.695131,43.61244 -4.5976,6.55482 -8.8822,11.8698 -9.52134,11.81107 -0.63913,-0.0588 -10.247928,-7.35244 -21.352884,-16.20826 l -20.190816,-16.10151 2.707849,-2.38356 c 1.489321,-1.31096 6.951995,-8.6047 12.139281,-16.20828 C 63.053688,134.7781 79.648747,113.1837 87.919962,104.90557 99.108571,93.707618 161.92088,47.267998 165.87816,47.267998 c 1.01806,0 6.69269,6.563464 14.78154,17.096772 8.97219,11.68359 13.98652,17.412996 15.83707,18.095508 1.48935,0.549308 2.56195,1.405552 2.38356,1.902774 -0.17838,0.497222 -9.97781,8.17306 -21.77647,17.057408 -11.79868,8.88435 -24.53989,19.01696 -28.31383,22.51693 -9.90524,9.18616 -10.36372,8.08567 13.25114,31.80676 23.70705,23.81367 82.80148,81.09955 141.39187,137.06463 24.12172,23.04089 46.89347,44.79423 50.60385,48.34075 4.33417,4.14273 7.53129,6.44822 8.94205,6.44822 2.09654,0 2.16595,0.22546 1.53452,4.98542 -1.05513,7.95396 -4.34674,15.12166 -8.10527,17.64986 -3.53476,2.37765 -10.33966,4.55387 -17.2606,5.51994 l -4.32941,0.60433 -56.61015,-60.64762 c -31.13559,-33.35619 -56.90485,-60.5284 -57.265,-60.38267 -0.36015,0.14572 -23.93578,26.65108 -52.39029,58.90076 -28.4545,32.2497 -53.29474,60.21406 -55.2005,62.14302 l -3.46504,3.50721 z m 128.77189,-157.7058 -11.38199,-10.76758 34.3437,-36.02871 c 28.98844,-30.41069 34.34373,-36.46012 34.34373,-38.79537 0,-2.38704 -3.24793,-5.79129 -23.67108,-24.81039 C 251.6469,97.031048 241.2322,86.727458 241.52218,86.258238 c 0.29,-0.46922 1.40116,-0.853128 2.46928,-0.853128 1.21064,0 8.3466,-6.104044 18.94838,-16.208272 9.35351,-8.91455 17.46528,-16.208272 18.02617,-16.208272 0.56087,0 10.70967,9.438934 22.55286,20.97541 22.4619,21.880148 24.03452,22.968086 27.56354,19.068557 0.94912,-1.048771 2.41,-1.901211 3.24642,-1.894319 0.83639,0.0066 4.51903,2.561594 8.18362,5.67711 4.25232,3.615156 7.68409,5.766526 9.48543,5.946386 l 2.82255,0.28182 -3.17888,3.60987 c -1.74839,1.98544 -3.32534,4.86761 -3.5043,6.40481 -0.28704,2.46525 0.58825,3.58575 7.42081,9.49974 4.26044,3.68767 8.21908,6.709 8.797,6.71407 0.95211,0.009 43.48691,82.03462 42.92509,82.77892 -0.13144,0.17415 -16.47163,-8.34302 -36.31152,-18.92704 l -36.07251,-19.24368 -10.97874,-10.86757 c -6.0383,-5.97718 -11.24953,-10.8676 -11.58048,-10.8676 -0.33097,0 -16.13639,17.59074 -35.12316,39.09054 -18.98678,21.4998 -34.5841,39.09023 -34.66075,39.08984 -0.0766,-3.8e-4 -5.26126,-4.84611 -11.52136,-10.76828 z"
+     style="fill:#000000;fill-opacity:1;stroke:#fafafa;stroke-width:38.13711548;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1935-3" />
+  <path
+     d="m 102.25974,377.26295 c -14.031744,-4.81075 -15.586986,-6.17631 -18.583819,-16.3172 -2.810762,-9.51128 -2.809437,-10.8384 0.0114,-11.42131 1.615526,-0.33382 18.301109,-17.21221 50.916589,-51.50493 26.68249,-28.05462 51.92883,-54.4988 56.10301,-58.76485 5.68824,-5.81343 7.38309,-8.11953 6.7658,-9.20581 -1.74565,-3.07182 -74.52754,-79.53498 -76.38389,-80.24733 -0.72092,-0.27663 -2.62097,0.8883 -4.22237,2.58877 -3.68792,3.9161 -21.765187,28.02959 -32.695131,43.61244 -4.5976,6.55482 -8.8822,11.8698 -9.52134,11.81107 -0.63913,-0.0588 -10.247928,-7.35244 -21.352884,-16.20826 l -20.190816,-16.10151 2.707849,-2.38356 c 1.489321,-1.31096 6.951995,-8.6047 12.139281,-16.20828 15.10023,-22.13409 31.695289,-43.72849 39.966504,-52.00662 11.188608,-11.197952 74.000917,-57.637572 77.958197,-57.637572 1.01806,0 6.69269,6.563464 14.78154,17.096772 8.97219,11.68359 13.98652,17.412996 15.83707,18.095508 1.48935,0.549308 2.56195,1.405552 2.38356,1.902774 -0.17838,0.497222 -9.97781,8.17306 -21.77647,17.057408 -11.79866,8.88435 -24.53989,19.01696 -28.31383,22.51693 -9.90523,9.18616 -10.36372,8.08567 13.25114,31.80676 23.70705,23.81367 82.80148,81.09955 141.39187,137.06463 24.12172,23.04089 46.89347,44.79423 50.60387,48.34075 4.33415,4.14273 7.53127,6.44822 8.94203,6.44822 2.09654,0 2.16595,0.22546 1.53452,4.98542 -1.05513,7.95396 -4.34674,15.12166 -8.10527,17.64986 -3.53476,2.37765 -10.33966,4.55387 -17.26058,5.51994 l -4.32942,0.60433 -56.61016,-60.64762 c -31.13559,-33.35619 -56.90484,-60.5284 -57.265,-60.38267 -0.36015,0.14572 -23.93578,26.65108 -52.39029,58.90076 -28.4545,32.2497 -53.29472,60.21406 -55.2005,62.14302 l -3.46504,3.50721 z m 128.77189,-157.7058 -11.38199,-10.76758 34.3437,-36.02871 c 28.98844,-30.41069 34.34373,-36.46012 34.34373,-38.79537 0,-2.38704 -3.24793,-5.79129 -23.67108,-24.81039 C 251.6469,97.031048 241.2322,86.727458 241.52218,86.258238 c 0.29,-0.46922 1.40116,-0.853128 2.46928,-0.853128 1.21064,0 8.3466,-6.104044 18.94838,-16.208272 9.35351,-8.91455 17.46528,-16.208272 18.02617,-16.208272 0.56087,0 10.70967,9.438934 22.55286,20.97541 22.4619,21.880148 24.03452,22.968086 27.56354,19.068557 0.94912,-1.048771 2.41,-1.901211 3.24642,-1.894319 0.83639,0.0069 4.51903,2.561594 8.18362,5.67711 4.25232,3.615156 7.68409,5.766526 9.48543,5.946386 l 2.82255,0.28182 -3.17888,3.60987 c -1.74839,1.98544 -3.32534,4.86761 -3.5043,6.40481 -0.28704,2.46525 0.58825,3.58575 7.42081,9.49974 4.26044,3.68767 8.21908,6.709 8.797,6.71407 0.95211,0.009 43.48691,82.03462 42.92509,82.77892 -0.13144,0.17415 -16.47163,-8.34302 -36.31152,-18.92704 l -36.07251,-19.24368 -10.97874,-10.86757 c -6.0383,-5.97718 -11.24953,-10.8676 -11.58048,-10.8676 -0.33097,0 -16.13639,17.59074 -35.12316,39.09054 -18.98678,21.4998 -34.5841,39.09023 -34.66075,39.08984 -0.0766,-3.8e-4 -5.26126,-4.84611 -11.52136,-10.76828 z"
+     style="fill:#000000;fill-opacity:1;stroke-width:0.95342779"
+     id="path1935"
+     inkscape:connector-curvature="0" />
 </svg>

trunk/resources/styles/standard/elemstyles.mapcss

@@ -3584 +3584 @@
 area[historic=battlefield],
 area[geological=palaeontological_site],
+area[historic=city_gate],
+area[historic=manor],
+area[historic=church],
+area[historic=charcoal_pile],
+area[historic=mine],
+area[historic=mine_shaft],
+area[historic=shieling],
 area[historic=wayside_cross],
 area[historic=wayside_shrine],
-area[historic=boundary_stone] {
+area[historic=boundary_stone],
+area[historic=milestone] {
     fill-color: historic#663300;
 }
@@ -3621 +3629 @@
     set icon_z17;
 }
+area[historic=citywalls]:closed {
+    fill-color: historic#663300;
+}
+way[historic=citywalls] {
+    width: 2;
+    color: historic#663300;
+}
+node[historic=city_gate] {
+    icon-image: "presets/sightseeing/city_gate.svg";
+    set icon_z17;
+}
+node[historic=manor] {
+    icon-image: "presets/sightseeing/manor.svg";
+    set icon_z17;
+}
+node[historic=church] {
+    icon-image: "presets/religion/historic_church.svg";
+    set icon_z17;
+}
+node[historic=charcoal_pile] {
+    icon-image: "presets/misc/charcoal_pile.svg";
+    set icon_z17;
+}
+node[historic=mine],
+node[historic=mine_shaft] {
+    icon-image: "presets/landmark/historic_mine.svg";
+    set icon_z17;
+}
+node[historic=shieling] {
+    icon-image: "presets/landmark/shieling.svg";
+    set icon_z17;
+}
 node[historic=wayside_cross] {
     icon-image: "presets/religion/wayside_cross.svg";
@@ -3631 +3671 @@
 node[historic=boundary_stone] {
     icon-image: "presets/landmark/boundary_stone.svg";
+    set icon_z17;
+}
+node[historic=milestone] {
+    icon-image: "presets/landmark/milestone.svg";
     set icon_z17;
 }