From 4ebc51a4b1d7a88387d2bad8cbe5354583c510e8 Mon Sep 17 00:00:00 2001 From: Tom MacWright Date: Wed, 7 Nov 2012 12:41:25 -0500 Subject: [PATCH] Remove conversion script and old style --- potlatch.css | 157 --------------------------------------------------- xmltojson.py | 22 -------- 2 files changed, 179 deletions(-) delete mode 100755 potlatch.css delete mode 100644 xmltojson.py diff --git a/potlatch.css b/potlatch.css deleted file mode 100755 index 12876bbb6..000000000 --- a/potlatch.css +++ /dev/null @@ -1,157 +0,0 @@ -/* - - Stylesheet that mimicks, to a certain extent, potlatch 1.x - Andy Allan, November 2009 - - Based heavily on: - MapCSS demonstration stylesheet - Richard Fairhurst, October 2009 -*/ - -/* A set of fairly standard rules. - We use z-index to make sure high-priority roads appear above minor ones. - The default z-index is 5. If an object matches multiple rules with the same - z-index then the rules are "merged" (but individual properties become one or the other) */ - -way[highway=motorway],way[highway=motorway_link], -way[highway=trunk],way[highway=trunk_link], -way[highway=primary],way[highway=primary_link], -way[highway=secondary],way[highway=secondary_link], -way[highway=tertiary],way[highway=tertiary_link], -way[highway=unclassified], -way[highway=residential] { text: name; text-color: black; font-size: 6; text-position: line;} -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: black; casing-width: 1; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: black; casing-width: 1; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 9; casing-color: black; casing-width: 1; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-width: 1; } -way[highway=tertiary],way[highway=unclassified] { z-index: 6; color: #FEFECB; width: 5; casing-width: 1; } -way[highway=residential] { z-index: 5; color: #E8E8E8; width: 6; casing-color: gray; casing-width: 1; } -way[highway=service] { color: white; width: 3; casing-width: 1; } - -/* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit -area=yes tag should be filled. The below doesn't yet work as intended. */ -way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; } -way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } - -way[highway=steps] { color: #FF6644; width: 2; dashes: 4, 2; } -way[highway=footway] { color: #FF6644; width: 2; dashes: 6, 3; } -way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; } -way[highway=track] { color: #996644; width: 2; dashes: 4, 2; } -way[highway=path] { color: lightgreen; width: 2; dashes: 2, 2; } - -way[waterway=river], way[waterway=canal] { - casing-width: 1; - casing-color: #6eafd4; - color: #10539a; - width: 3; - text:name; - text-color:blue; - font-size:7; - text-position: offset; - text-offset: -5; -} - -way[barrier] {color: #000000; width: 1} - -/* Fills can be solid colour or bitmap images */ - -way[natural] :area { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } -way[landuse] :area { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; } -way[amenity],way[shop] :area { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } -way[leisure],way[sport] :area { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } -way[tourism] :area { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; } -way[historic],way[ruins] :area { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; } -way[military] :area { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; } -way[building] :area { color: #ff6ec7; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } -way[natural=water], -way[waterway] :area { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; } -way[landuse=forest],way[natural=wood] :area { color: green; width: 2; fill-color: green; fill-opacity: 0.2; } -way[leisure=pitch],way[leisure=park] { color: #44ff44; width: 1; fill-color: #44ff44; fill-opacity: 0.2; } -way[amenity=parking] :area { color: gray; width: 1; fill-color: gray; fill-opacity: 0.2; } -way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } - -/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ - -node[addr:housenumber], -node[addr:housename] { icon-image: circle; icon-width: 4; color: #B0E0E6; casing-color:blue; casing-width: 1; } -way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} - -/* POIs, too, can have bitmap icons - they can even be transparent */ - -node[amenity=pub] { icon-image: icons/pub.png; text-offset: 15; font-family: DejaVu; text: name; font-size: 9; icon-width: 16; } -node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; } -node[railway=station] { icon-image: icons/station.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; icon-width: 16; } -node[aeroway=aerodrome] { icon-image: icons/airport.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 10; icon-width: 16; } -node[amenity=atm] { icon-image: icons/atm.png; icon-width: 16; } -node[amenity=bank] { icon-image: icons/bank.png; text-offset: 15; text: name; icon-width: 16; } -node[highway=bus_stop] { icon-image: icons/bus_stop.png; icon-width: 16; } -node[amenity=cafe] { icon-image: icons/cafe.png; text-offset: 15; text: name; icon-width: 16; } -node[shop=convenience] { icon-image: icons/convenience.png; text-offset:15; text:name; icon-width: 16; } -node[shop=supermarket] { icon-image: icons/supermarket.png; text-offset:15; text:name; icon-width: 16; } -node[amenity=fast_food] { icon-image: icons/fast_food.png; text-offset:15; text: name; icon-width: 16; } -node[amenity=fire_station] { icon-image: icons/fire_station.png; icon-width: 16; } -node[amenity=hospital] { icon-image: icons/hospital.png; icon-width: 16; } -node[tourism=hotel] { icon-image: icons/hotel.png; icon-width: 16; } -node[amenity=parking] { icon-image: icons/parking.png; icon-width: 16; } -node[amenity=bicycle_parking] { icon-image: icons/parking_cycle.png; text-offset: 15; text: capacity; icon-width: 16; } -node[amenity=pharmacy] { icon-image: icons/pharmacy.png; icon-width: 16; } -node[amenity=pharmacy][dispensing=yes] { icon-image: icons/pharmacy_dispensing.png; icon-width: 16; } -node[amenity=police] { icon-image: icons/police.png; icon-width: 16; } -node[amenity=post_box] { icon-image: icons/post_box.png; icon-width: 16; } -node[amenity=recycling] { icon-image: icons/recycling.png; icon-width: 16; } -node[amenity=restaurant] { icon-image: icons/restaurant.png; icon-width: 16; } -node[amenity=school] { icon-image: icons/school.png; icon-width: 16; } -node[amenity=taxi] { icon-image: icons/taxi.png; icon-width: 16; } -node[amenity=telephone] { icon-image: icons/telephone.png; icon-width: 16; } -way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; icon-width: 7; } - -/* We can stack styles at different z-index (depth) */ - -way[railway=rail] - { z-index: 6; color: black; width: 5; } - { z-index: 7; color: white; width: 3; dashes: 12,12; } -way[railway=subway] - { z-index: 6; color: #444444; width: 5; } - { z-index: 7; color: white; width: 3; dashes: 8,8; } - -/* Bridge */ -way[bridge=yes] - { z-index: 4; color: white; width: eval('_width+3'); } - { z-index: 3; color: black; width: eval('_width+6'); } - -/* Tunnel */ -way[tunnel=yes] - { z-index: 4; color: white; width: eval('_width+2'); } - { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } - -/* Oneway */ -way[oneway=yes] { z-index: 10; color: #444444; width: 3; dashes: 15,25; line-style: arrows; } - - -/* Change the road colour based on dynamically set "highlighted" tag (see earlier) */ - -way .highlighted { color: pink; } - -/* Interactive editors may choose different behaviour when a user mouses-over or selects - an object. Potlatch 2 supports these but the stand-alone Halcyon viewer does not */ - -way !:drawn { z-index:10; width: 1; color: black; } -way::highlight :hover { z-index: 2; width: eval('_width+10'); color: #ffff99; } -way::highlight :selected { z-index: 2; width: eval('_width+5'); color: #FFF68D; } - -node :selectedway { z-index: 9; icon-image: circle; icon-width: 7; color: #DD4848; layer: 5; } -node::junction :junction :selectedway, node::junction :junction :hoverway { z-index: 8; icon-image: square; icon-width: 11; casing-color: black; casing-width: 1; layer: 5; } - -node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 6; color: #98D1FD; casing-color: #135485; casing-width: 2; } - -node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; } -node::highlight :selected { z-index: 1; icon-image: circle; icon-width: eval('_width+2'); color: #FFF68D; } - -/* Descendant selectors provide an easy way to style relations: this example means "any way - which is part of a relation whose type=route". */ - -relation[type=route] way { z-index: 1; width: 17; color: blue; opacity: 0.3; } -relation[type=route][route=bicycle][network=ncn] way { z-index: 1; width: 12; color: red; opacity: 0.3; } -relation[type=route][route=bicycle][network=rcn] way { z-index: 1; width: 12; color: cyan; opacity: 0.3; } -relation[type=route][route=bicycle][network=lcn] way { z-index: 1; width: 12; color: blue; opacity: 0.3; } -relation[type=route][route=foot] way { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; } diff --git a/xmltojson.py b/xmltojson.py deleted file mode 100644 index c3ea86b8f..000000000 --- a/xmltojson.py +++ /dev/null @@ -1,22 +0,0 @@ -from xml.dom.minidom import parse, parseString -import re, json - -# this needs to strip xml entities first -doc = parse(open('tmp_markers.xml')) - -rules = [] - -b = re.compile(r"\[(?P\w+)\]\s*\=\s*\'(?P\w+)\'") -c = re.compile(r"\/(?P\w+)") -for s in doc.getElementsByTagName('Rule'): - filt = str(s.getElementsByTagName('Filter')[0].childNodes[0].wholeText) - sym = str(s.getElementsByTagName('PointSymbolizer')[0].getAttribute('file')) - gd = b.match(filt).groupdict() - ic = c.match(sym).groupdict() - rules.append({ - 'tags': { - gd['tag']: gd['value'] - }, - 'icon': ic['icon'] - }) -json.dump(rules, open('rules.js', 'w'), indent=4)