Add support city plan boundaries

Author: juyrjola

Diff for: demo/static/js/address.coffee

@@ -85,3 +85,27 @@ $("#district-input").on 'change', ->
     borders.bindPopup match_obj.name
     borders.addTo map
     map.fitBounds borders.getBounds()
+
+show_plans = false
+$("#show-plans").on 'click', ->
+    show_plans = true
+    refresh_plans()
+
+map.on 'moveend', (ev) ->
+    if show_plans
+        refresh_plans()
+
+plans = {}
+
+refresh_plans = ->
+    bounds = map.getBounds().toBBoxString()
+    $.getJSON API_PREFIX + 'v1/plan/', {bbox: bounds, limit: 100}, (data) ->
+        for obj in data.objects
+            if obj.id of plans
+                continue
+            plans[obj.id] = obj
+            geom = L.geoJson obj.geometry,
+                style:
+                    weight: 2
+            geom.bindPopup "Kaava nr. <b>#{obj.origin_id}</b>"
+            geom.addTo map

Diff for: demo/templates/demo.html

@@ -39,10 +39,13 @@
                 <h1>Paikkatieto-demo</h1>
             </div>
             <div style="clear: both"></div>
-            <div class="span8 row" style="margin-bottom: 20px">
+            <div class="span8 row">
                 <input type="text" class="span4" id="address-input" placeholder="Input an address...">
                 <input type="text" class="span4" id="district-input" placeholder="Input a district...">
             </div>
+            <div class="span8 row" style="margin-bottom: 20px">
+                <button id="show-plans" class="btn">Show plans</button>
+            </div>
             <div style="clear: both"></div>
             <div class="well span8 row">
                 <div id="map" style="margin-left: 10px; width: 600px; height: 400px"></div>

Diff for: geo/api.py

@@ -2,7 +2,7 @@
 import re
 
 from django.db.models import Q
-from django.contrib.gis.geos import Point
+from django.contrib.gis.geos import Point, Polygon
 from django.contrib.gis.measure import D
 from tastypie.resources import ModelResource
 from tastypie.exceptions import InvalidFilterError
@@ -189,7 +189,45 @@ class Meta:
             'name': ALL,
         }
 
+def build_bbox_filter(bbox_val, field_name):
+    points = bbox_val.split(',')
+    if len(points) != 4:
+        raise InvalidFilterError("bbox must be in format 'left,bottom,right,top'")
+    try:
+        points = [float(p) for p in points]
+    except ValueError:
+        raise InvalidFilterError("bbox values must be floating point")
+    poly = Polygon.from_bbox(points)
+    poly.srid = 4326
+    poly.transform(PROJECTION_SRID)
+    return {"%s__intersects" % field_name: poly}
+
+class PlanResource(GeometryModelResource):
+    municipality = fields.ToOneField(MunicipalityResource, 'municipality',
+        help_text="ID of the municipality that this plan belongs to")
+
+    def build_filters(self, filters=None):
+        orm_filters = super(PlanResource, self).build_filters(filters)
+        if filters and 'bbox' in filters:
+            bbox_filter = build_bbox_filter(filters['bbox'], 'geometry')
+            orm_filters.update(bbox_filter)
+        return orm_filters
+
+    def full_dehydrate(self, bundle, for_list=False):
+        # Convert to WGS-84 before outputting.
+        bundle.obj.geometry.transform(4326)
+        return super(PlanResource, self).full_dehydrate(bundle, for_list)
+
+    class Meta:
+        queryset = Plan.objects.all()
+        filtering = {
+            'municipality': ALL,
+            'origin_id': ['exact'],
+            'in_effect': ['exact'],
+            'geometry': ALL,
+        }
+
 all_resources = [
     MunicipalityResource, MunicipalityBoundaryResource, AddressResource, POICategoryResource,
-    POIResource, DistrictResource
+    POIResource, DistrictResource, PlanResource,
 ]

Diff for: geo/importer/helsinki.py

@@ -6,7 +6,7 @@
 from django.conf import settings
 from django import db
 from django.contrib.gis.gdal import DataSource, SpatialReference, CoordTransform
-from django.contrib.gis.geos import GEOSGeometry, MultiPolygon, Point
+from django.contrib.gis.geos import GEOSGeometry, MultiPolygon, Polygon, Point
 
 MUNI_URL = "http://tilastokeskus.fi/meta/luokitukset/kunta/001-2013/tekstitiedosto.txt"
 
@@ -52,7 +52,7 @@ def import_districts(self):
             obj_map[obj.origin_id] = obj
             obj.found = False
 
-        def import_from_file(fname):
+        def import_from_file(fname, district_type):
             path = os.path.join(self.data_path, 'aluejaot', fname)
             ds = DataSource(path, encoding='iso8859-1')
             lyr = ds[0]
@@ -76,15 +76,63 @@ def import_from_file(fname):
                 district.name = name
                 print district.name
                 district.borders = GEOSGeometry(geom.wkb, srid=geom.srid)
+                district.type = district_type
                 district.save()
                 district.found = True
-        import_from_file('osaalue.tab')
-        import_from_file('kaupunginosa.tab')
+        import_from_file('osaalue.tab', 'osa-alue')
+        import_from_file('kaupunginosa.tab', 'kaupunginosa')
 
         for key, obj in obj_map.iteritems():
             if not obj.found:
                 print "District %s deleted" % obj.name
 
+    def _import_plans(self, fname, in_effect):
+        path = os.path.join(self.data_path, 'kaavahakemisto', fname)
+        ds = DataSource(path, encoding='iso8859-1')
+        lyr = ds[0]
+
+        for idx, feat in enumerate(lyr):
+            origin_id = feat['kaavatunnus'].as_string()
+            geom = feat.geom
+            geom.srid = GK25_SRID
+            geom.transform(PROJECTION_SRID)
+            if origin_id not in self.plan_map:
+                obj = Plan(origin_id=origin_id, municipality=self.muni)
+                self.plan_map[origin_id] = obj
+            else:
+                obj = self.plan_map[origin_id]
+                if not obj.found:
+                    obj.geometry = None
+            poly = GEOSGeometry(geom.wkb, srid=geom.srid)
+            if obj.geometry:
+                obj.geometry.append(poly)
+            else:
+                obj.geometry = MultiPolygon(poly)
+            obj.in_effect = in_effect
+            obj.found = True
+            if (idx % 500) == 0:
+                print "%d imported" % idx
+        if in_effect:
+            type_str = "in effect"
+        else:
+            type_str = "development"
+        print "%d %s plans imported" % (idx, type_str)
+
+    def import_plans(self):
+        self.plan_map = {}
+        self.muni = Municipality.objects.get(name="Helsinki")
+        for obj in Plan.objects.filter(municipality=self.muni):
+            self.plan_map[obj.origin_id] = obj
+            obj.found = False
+        self._import_plans('Lv_rajaus.TAB', True)
+        self._import_plans('Kaava_vir_rajaus.TAB', False)
+        print "Saving"
+        for key, obj in self.plan_map.iteritems():
+            if obj.found:
+                obj.save()
+            else:
+                print "Plan %s deleted" % obj.name
+
     def import_addresses(self):
         f = open(os.path.join(self.data_path, 'pks_osoite.csv'))
         reader = csv.reader(f, delimiter=',')

Diff for: geo/management/commands/geo_import.py

@@ -10,6 +10,7 @@ class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('--municipality', action='store_true', dest='municipality', help='Import municipalities'),
         make_option('--district', action='store_true', dest='district', help='Import muni districts'),
+        make_option('--plan', action='store_true', dest='plan', help='Import muni plan'),
         make_option('--address', action='store_true', dest='address', help='Import addresses'),
         make_option('--poi', action='store_true', dest='poi', help='Import POIs'),
         make_option('--all', action='store_true', dest='all', help='Import all entities.'),
@@ -27,6 +28,9 @@ def handle(self, *args, **options):
         if options['all'] or options['district']:
             print "Importing districts"
             importer.import_districts()
+        if options['all'] or options['plan']:
+            print "Importing plans"
+            importer.import_plans()
         if options['all'] or options['address']:
             print "Importing addresses"
             importer.import_addresses()

Diff for: geo/models.py

@@ -24,11 +24,26 @@ class MunicipalityBoundary(models.Model):
 class District(models.Model):
     municipality = models.ForeignKey(Municipality)
     name = models.CharField(max_length=50)
+    type = models.CharField(max_length=20)
     borders = models.PolygonField()
     origin_id = models.CharField(max_length=20)
 
     objects = models.GeoManager()
 
+    class Meta:
+        unique_together = (('municipality', 'origin_id'))
+
+class Plan(models.Model):
+    municipality = models.ForeignKey(Municipality)
+    geometry = models.MultiPolygonField(srid=PROJECTION_SRID)
+    origin_id = models.CharField(max_length=20)
+    in_effect = models.BooleanField()
+
+    objects = models.GeoManager()
+
+    class Meta:
+        unique_together = (('municipality', 'origin_id'),)
+
 class Address(models.Model):    
     street = models.CharField(max_length=50, db_index=True,
         help_text="Name of the street")

Diff for: requirements.txt

@@ -1,5 +1,5 @@
 Django
--e git+https://github.com/toastdriven/django-tastypie.git#egg=django-tastypie
+django-tastypie
 django_compressor
 psycopg2
 requests