map: Remove V1 hood layer
This removes the layer which used to show the hood borders, not the one with the V1 routers. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
parent
6efd0bda59
commit
0d320259e9
|
@ -1,28 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE Map>
|
||||
<Map background-color="transparent" srs="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over">
|
||||
<Style name="hoodpoint">
|
||||
<Rule>
|
||||
<TextSymbolizer face-name="DejaVu Sans Book" size="12" fill="#73b9ff" halo-radius="2">[name]</TextSymbolizer>
|
||||
</Rule>
|
||||
</Style>
|
||||
<Style name="hoodborder">
|
||||
<Rule>
|
||||
<LineSymbolizer stroke-width="3" stroke="#73b9ff" stroke-linecap="butt" stroke-dasharray="6, 2" clip="false" />
|
||||
</Rule>
|
||||
</Style>
|
||||
<Layer name="borders" srs="+proj=latlong +ellps=WGS84 +datum=WGS84 +no_defs">
|
||||
<StyleName>hoodborder</StyleName>
|
||||
<Datasource>
|
||||
<Parameter name="type">csv</Parameter>
|
||||
<Parameter name="file">csv/hoods.csv</Parameter>
|
||||
</Datasource>
|
||||
</Layer>
|
||||
<Layer name="points" srs="+proj=latlong +ellps=WGS84 +datum=WGS84 +no_defs">
|
||||
<StyleName>hoodpoint</StyleName>
|
||||
<Datasource>
|
||||
<Parameter name="type">csv</Parameter>
|
||||
<Parameter name="file">csv/hood-points.csv</Parameter>
|
||||
</Datasource>
|
||||
</Layer>
|
||||
</Map>
|
|
@ -3,7 +3,6 @@
|
|||
liteserv.py routers.xml --processes=5 &
|
||||
liteserv.py routers_v2.xml -p 8003 --processes=5 &
|
||||
liteserv.py routers_local.xml -p 8004 --processes=5 &
|
||||
liteserv.py hoods.xml -p 8001 --processes=5 &
|
||||
liteserv.py hoods_v2.xml -p 8002 --processes=5
|
||||
liteserv.py hoods_poly.xml -p 8005 --processes=5
|
||||
|
||||
|
|
|
@ -34,16 +34,6 @@
|
|||
"metatile": {"buffer": 128},
|
||||
"cache lifespan": 300
|
||||
},
|
||||
"tiles/hoods": {
|
||||
"provider": {
|
||||
"class": "dynmapnik:DynMapnik",
|
||||
"kwargs": {
|
||||
"mapfile": "/usr/share/ffmap/hoods.xml"
|
||||
}
|
||||
},
|
||||
"metatile": {"buffer": 128},
|
||||
"cache lifespan": 300
|
||||
},
|
||||
"tiles/hoods_v2": {
|
||||
"provider": {
|
||||
"class": "dynmapnik:DynMapnik",
|
||||
|
|
|
@ -215,28 +215,6 @@ def update_mapnik_csv(mysql):
|
|||
for link in linksl3local:
|
||||
csv.write("\"LINESTRING (%f %f,%f %f)\"\n" % link)
|
||||
|
||||
dbhoods = mysql.fetchall("""
|
||||
SELECT name, lat, lng FROM hoodsv1
|
||||
WHERE lat IS NOT NULL AND lng IS NOT NULL
|
||||
""")
|
||||
with open(os.path.join(CONFIG["csv_dir"], "hood-points.csv"), "w", encoding="UTF-8") as csv:
|
||||
csv.write("lng,lat,name\n")
|
||||
for hood in dbhoods:
|
||||
csv.write("%f,%f,\"%s\"\n" % (
|
||||
hood["lng"],
|
||||
hood["lat"],
|
||||
hood["name"]
|
||||
))
|
||||
|
||||
with open(os.path.join(CONFIG["csv_dir"], "hoods.csv"), "w") as csv:
|
||||
csv.write("WKT\n")
|
||||
hoods = []
|
||||
for hood in dbhoods:
|
||||
# convert coordinates info marcator sphere as voronoi doesn't work with lng/lat
|
||||
x, y = merc_sphere(hood["lng"], hood["lat"])
|
||||
hoods.append([x, y])
|
||||
draw_voronoi_lines(csv, hoods)
|
||||
|
||||
dbhoodsv2 = mysql.fetchall("""
|
||||
SELECT name, lat, lng FROM hoodsv2
|
||||
WHERE lat IS NOT NULL AND lng IS NOT NULL
|
||||
|
@ -294,7 +272,6 @@ def update_mapnik_csv(mysql):
|
|||
csv.write("\"LINESTRING (%f %f,%f %f)\"\n" % (oldlon, oldlat, polygon[0]["lon"], polygon[0]["lat"]))
|
||||
|
||||
# touch mapnik XML files to trigger tilelite watcher
|
||||
touch("/usr/share/ffmap/hoods.xml")
|
||||
touch("/usr/share/ffmap/hoods_v2.xml")
|
||||
touch("/usr/share/ffmap/hoods_poly.xml")
|
||||
touch("/usr/share/ffmap/routers.xml")
|
||||
|
|
|
@ -30,7 +30,6 @@ tileurls = {
|
|||
"routers": "/tiles/routers",
|
||||
"routers_v2": "/tiles/routers_v2",
|
||||
"routers_local": "/tiles/routers_local",
|
||||
"hoods": "/tiles/hoods",
|
||||
"hoods_v2": "/tiles/hoods_v2",
|
||||
"hoods_poly": "/tiles/hoods_poly"
|
||||
}
|
||||
|
|
|
@ -28,7 +28,6 @@ var overlay_config = {
|
|||
var routers = new L.TileLayer(tileurls.routers + '/{z}/{x}/{y}.png', overlay_config);
|
||||
var routers_v2 = new L.TileLayer(tileurls.routers_v2 + '/{z}/{x}/{y}.png', overlay_config);
|
||||
var routers_local = new L.TileLayer(tileurls.routers_local + '/{z}/{x}/{y}.png', overlay_config);
|
||||
var hoods = new L.TileLayer(tileurls.hoods + '/{z}/{x}/{y}.png', overlay_config);
|
||||
var hoods_v2 = new L.TileLayer(tileurls.hoods_v2 + '/{z}/{x}/{y}.png', overlay_config);
|
||||
var hoods_poly = new L.TileLayer(tileurls.hoods_poly + '/{z}/{x}/{y}.png', overlay_config);
|
||||
var popuplayer = new L.TileLayer('');
|
||||
|
@ -40,7 +39,6 @@ layersControl = new L.Control.Layers({
|
|||
"Routers V1": routers,
|
||||
"Routers V2": routers_v2,
|
||||
"Local Routers": routers_local,
|
||||
"Hoods V1": hoods,
|
||||
"Hoods V2": hoods_v2,
|
||||
"Poly-Hoods": hoods_poly,
|
||||
"Position-Popup": popuplayer
|
||||
|
@ -67,7 +65,7 @@ function update_permalink() {
|
|||
+ '&layers=' + (map.hasLayer(routers)|0) + ','
|
||||
+ (map.hasLayer(routers_v2)|0) + ','
|
||||
+ (map.hasLayer(routers_local)|0) + ','
|
||||
+ (map.hasLayer(hoods)|0) + ','
|
||||
+ '0,'
|
||||
+ (map.hasLayer(hoods_v2)|0) + ','
|
||||
+ (map.hasLayer(hoods_poly)|0) + ','
|
||||
+ (map.hasLayer(popuplayer)|0)
|
||||
|
@ -94,7 +92,7 @@ function setupLayers(getargs) {
|
|||
if(getlayers[0]==1) { routers.addTo(map); }
|
||||
if(getlayers[1]==1) { routers_v2.addTo(map); }
|
||||
if(getlayers[2]==1) { routers_local.addTo(map); }
|
||||
if(getlayers[3]==1) { hoods.addTo(map); }
|
||||
// getlayers[3] former hoods_v1 unused
|
||||
if(getlayers[4]==1) { hoods_v2.addTo(map); }
|
||||
if(getlayers[5]==1) { hoods_poly.addTo(map); }
|
||||
if(getlayers[6]==1) { popuplayer.addTo(map); }
|
||||
|
|
|
@ -5,9 +5,9 @@ mkdir -vp /var/lib/ffmap/csv
|
|||
chown -R www-data:www-data /var/lib/ffmap
|
||||
|
||||
mkdir -vp /usr/share/ffmap
|
||||
cp -v ffmap/mapnik/{hoods,hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml /usr/share/ffmap
|
||||
sed -i -e 's#>csv/#>/var/lib/ffmap/csv/#' /usr/share/ffmap/{hoods,hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml
|
||||
chown www-data:www-data /usr/share/ffmap/{hoods,hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml
|
||||
cp -v ffmap/mapnik/{hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml /usr/share/ffmap
|
||||
sed -i -e 's#>csv/#>/var/lib/ffmap/csv/#' /usr/share/ffmap/{hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml
|
||||
chown www-data:www-data /usr/share/ffmap/{hoods_v2,hoods_poly,routers,routers_v2,routers_local}.xml
|
||||
|
||||
cp -v ffmap/mapnik/tilestache.cfg /usr/share/ffmap
|
||||
cp -rv ffmap/web/static /usr/share/ffmap
|
||||
|
|
Loading…
Reference in New Issue