Skip to content

Commit

Permalink
Merge pull request #59 from Gustry/boundary
Browse files Browse the repository at this point in the history
Boundary and queries encoding
  • Loading branch information
Gustry committed Jun 3, 2015
2 parents bb4c634 + 08c3e7a commit ad8c94c
Show file tree
Hide file tree
Showing 8 changed files with 422 additions and 2 deletions.
5 changes: 3 additions & 2 deletions reporter/queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
'({SW_lat},{SW_lng},{NE_lat},{NE_lng});'
');'
'(._;>;);'
'out+body;')
'out body;')

ROADS_OVERPASS_QUERY = (
'('
Expand All @@ -87,7 +87,7 @@
'({SW_lat},{SW_lng},{NE_lat},{NE_lng});'
');'
'(._;>;);'
'out+body;')
'out body;')

BOUNDARY_1_OVERPASS_QUERY = (
'('
Expand Down Expand Up @@ -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',
Expand Down
5 changes: 5 additions & 0 deletions reporter/resources/boundary/boundary-en.keywords
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
category: boundary
subcategory: boundary
title: Boundary
source: OpenStreetMap - www.openstreetmap.org
license: Open Data Commons Open Database License (ODbL)
35 changes: 35 additions & 0 deletions reporter/resources/boundary/boundary-en.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="2.8.1-Wien" minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
<edittypes>
<edittype widgetv2type="TextEdit" name="NAME">
<widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
</edittype>
<edittype widgetv2type="TextEdit" name="POPULATION">
<widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
</edittype>
<edittype widgetv2type="TextEdit" name="REF">
<widgetv2config IsMultiline="0" fieldEditable="1" UseHtml="0" labelOnTop="0"/>
</edittype>
</edittypes>
<renderer-v2 symbollevels="0" type="singleSymbol">
<symbols>
<symbol alpha="1" type="fill" name="0">
<layer pass="0" class="SimpleFill" locked="0">
<prop k="border_width_map_unit_scale" v="0,0"/>
<prop k="color" v="73,10,102,255"/>
<prop k="joinstyle" v="bevel"/>
<prop k="offset" v="0,0"/>
<prop k="offset_map_unit_scale" v="0,0"/>
<prop k="offset_unit" v="MM"/>
<prop k="outline_color" v="0,0,0,255"/>
<prop k="outline_style" v="dash"/>
<prop k="outline_width" v="0.26"/>
<prop k="outline_width_unit" v="MM"/>
<prop k="style" v="no"/>
</layer>
</symbol>
</symbols>
<rotation/>
<sizescale scalemethod="area"/>
</renderer-v2>
</qgis>
5 changes: 5 additions & 0 deletions reporter/resources/boundary/boundary-fr.keywords
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
category: boundary
subcategory: boundary
title: Limite
source: OpenStreetMap - www.openstreetmap.org
license: Open Data Commons Open Database License (ODbL)
12 changes: 12 additions & 0 deletions reporter/resources/boundary/boundary.license
Original file line number Diff line number Diff line change
@@ -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.
1 change: 1 addition & 0 deletions reporter/resources/boundary/boundary.prj
Original file line number Diff line number Diff line change
@@ -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"]]
7 changes: 7 additions & 0 deletions reporter/resources/boundary/boundary.style
Original file line number Diff line number Diff line change
@@ -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
354 changes: 354 additions & 0 deletions reporter/resources/potential-idp/potential-idp-fr.qml

Large diffs are not rendered by default.

0 comments on commit ad8c94c

Please sign in to comment.