From 792c853efa9dab73ee31bbf6c02aa3bca1568c1e Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Wed, 3 Jun 2015 18:00:39 +0200 Subject: [PATCH 1/3] fix overpass encoding --- reporter/queries.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/reporter/queries.py b/reporter/queries.py index 211b1ad..23c2ecb 100644 --- a/reporter/queries.py +++ b/reporter/queries.py @@ -75,7 +75,7 @@ '({SW_lat},{SW_lng},{NE_lat},{NE_lng});' ');' '(._;>;);' - 'out+body;') + 'out body;') ROADS_OVERPASS_QUERY = ( '(' @@ -87,7 +87,7 @@ '({SW_lat},{SW_lng},{NE_lat},{NE_lng});' ');' '(._;>;);' - 'out+body;') + 'out body;') BOUNDARY_1_OVERPASS_QUERY = ( '(' @@ -307,6 +307,7 @@ 'buildings': 'buildings', 'building-points': 'building-points', 'roads': 'roads', + 'potential-idp': 'potential-idp', 'boundary-1': 'boundary', 'boundary-2': 'boundary', 'boundary-3': 'boundary', From 4330d1ea36566be67ba7655f740589b5e1ed1147 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Wed, 3 Jun 2015 18:01:06 +0200 Subject: [PATCH 2/3] add french translations to potential idp --- .../potential-idp/potential-idp-fr.qml | 354 ++++++++++++++++++ 1 file changed, 354 insertions(+) create mode 100644 reporter/resources/potential-idp/potential-idp-fr.qml diff --git a/reporter/resources/potential-idp/potential-idp-fr.qml b/reporter/resources/potential-idp/potential-idp-fr.qml new file mode 100644 index 0000000..67e30da --- /dev/null +++ b/reporter/resources/potential-idp/potential-idp-fr.qml @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + TYPE + + + + + + 0 + + generatedlayout + + + + From 08c3e7a356a4aa79be5133223662001684d2e7d1 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Wed, 3 Jun 2015 18:01:38 +0200 Subject: [PATCH 3/3] add boundary resource folder --- .../resources/boundary/boundary-en.keywords | 5 +++ reporter/resources/boundary/boundary-en.qml | 35 +++++++++++++++++++ .../resources/boundary/boundary-fr.keywords | 5 +++ reporter/resources/boundary/boundary.license | 12 +++++++ reporter/resources/boundary/boundary.prj | 1 + reporter/resources/boundary/boundary.style | 7 ++++ 6 files changed, 65 insertions(+) create mode 100644 reporter/resources/boundary/boundary-en.keywords create mode 100644 reporter/resources/boundary/boundary-en.qml create mode 100644 reporter/resources/boundary/boundary-fr.keywords create mode 100644 reporter/resources/boundary/boundary.license create mode 100644 reporter/resources/boundary/boundary.prj create mode 100644 reporter/resources/boundary/boundary.style diff --git a/reporter/resources/boundary/boundary-en.keywords b/reporter/resources/boundary/boundary-en.keywords new file mode 100644 index 0000000..655e946 --- /dev/null +++ b/reporter/resources/boundary/boundary-en.keywords @@ -0,0 +1,5 @@ +category: boundary +subcategory: boundary +title: Boundary +source: OpenStreetMap - www.openstreetmap.org +license: Open Data Commons Open Database License (ODbL) diff --git a/reporter/resources/boundary/boundary-en.qml b/reporter/resources/boundary/boundary-en.qml new file mode 100644 index 0000000..e467f26 --- /dev/null +++ b/reporter/resources/boundary/boundary-en.qml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/reporter/resources/boundary/boundary-fr.keywords b/reporter/resources/boundary/boundary-fr.keywords new file mode 100644 index 0000000..8b890c2 --- /dev/null +++ b/reporter/resources/boundary/boundary-fr.keywords @@ -0,0 +1,5 @@ +category: boundary +subcategory: boundary +title: Limite +source: OpenStreetMap - www.openstreetmap.org +license: Open Data Commons Open Database License (ODbL) diff --git a/reporter/resources/boundary/boundary.license b/reporter/resources/boundary/boundary.license new file mode 100644 index 0000000..4d856e3 --- /dev/null +++ b/reporter/resources/boundary/boundary.license @@ -0,0 +1,12 @@ +OpenStreetMap is open data, licensed under the Open Data Commons Open +Database License (ODbL). + +You are free to copy, distribute, transmit and adapt our data, as long as you +credit OpenStreetMap and its contributors. If you alter or build upon our data, +you may distribute the result only under the same licence. The full legal code +explains your rights and responsibilities. + +The cartography in our map tiles, and our documentation, are licensed under the +Creative Commons Attribution-ShareAlike 2.0 license (CC-BY-SA). + +Please visit http://www.openstreetmap.org/copyright for more information. diff --git a/reporter/resources/boundary/boundary.prj b/reporter/resources/boundary/boundary.prj new file mode 100644 index 0000000..c237660 --- /dev/null +++ b/reporter/resources/boundary/boundary.prj @@ -0,0 +1 @@ +GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]] \ No newline at end of file diff --git a/reporter/resources/boundary/boundary.style b/reporter/resources/boundary/boundary.style new file mode 100644 index 0000000..a99e933 --- /dev/null +++ b/reporter/resources/boundary/boundary.style @@ -0,0 +1,7 @@ +node,way admin_level text linear #osm2pgsql style +node,way boundary text linear #osm2pgsql style +node,way name text linear #osm2pgsql style +node,way population text linear #osm2pgsql style +node,way ref text linear #osm2pgsql style +way way_area real #osm2pgsql style +node,way z_order int4 linear #osm2pgsql style \ No newline at end of file