[SL] Use geojson from Geoportal

Author: k-nut

jedeschule/spiders/saarland.py

@@ -1,59 +1,36 @@
-import xmltodict
 from scrapy import Item
 
 from jedeschule.items import School
 from jedeschule.spiders.school_spider import SchoolSpider
+from jedeschule.wfs_basic_parsers import parse_geojson_features
 
 
 class SaarlandSpider(SchoolSpider):
     name = "saarland"
     start_urls = [
-        "https://geoportal.saarland.de/arcgis/services/Internet/Staatliche_Dienste/MapServer/WFSServer?"
-        "SERVICE=WFS&REQUEST=GetFeature&typeName=Staatliche%5FDienste:Schulen%5FSL&srsname=EPSG:4326"
+        "https://geoportal.saarland.de/spatial-objects/257/collections/Staatliche_Dienste:Schulen_SL/items?f=json&limit=2500"
     ]
 
     def parse(self, response, **kwargs):
-        data = xmltodict.parse(response.text)
-        members = data.get("wfs:FeatureCollection", {}).get("wfs:member", [])
-
-        if not isinstance(members, list):
-            members = [members]
-
-        for member in members:
-            school = member.get("Staatliche_Dienste:Schulen_SL", {})
-            data_elem = {}
-
-            for key, value in school.items():
-                if key == "Staatliche_Dienste:SHAPE":
-                    pos = (value.get("gml:Point", {})
-                           .get("gml:pos", "")
-                           .strip())
-                    if pos:
-                        lat, lon = pos.split()
-                        data_elem["lat"] = float(lat)
-                        data_elem["lon"] = float(lon)
-
-                    continue
-
-                clean_key = key.split(":")[-1]
-                if clean_key == "PLZ":
-                    value = value.split(".")[0]
-
-                data_elem[clean_key] = value
-
-            yield data_elem
+        yield from parse_geojson_features(response)
 
     @staticmethod
     def normalize(item: Item) -> School:
-        # The data also contains a field called `SCHULKENNZ` which implies that it might be an id
-        # that could be used, but some schools share ids (especially `0` or `000000`) which makes for collisions
+        # The data also contains a field called `Schulkennz` which implies that it might be an id
+        # that could be used, but some schools share ids (especially `0` or `000000`) or
+        # do not have any set at all which makes for collisions
         school_id = item.get("OBJECTID")
 
         return School(
-            name=item.get("Bezeichnun"),
             address=item.get("Straße", "").strip(),
             city=item.get("Ort"),
-            zip=item.get("PLZ"),
-            school_type=item.get("Schulform"),
+            fax=item.get("Fax"),
             id=f"SL-{school_id}",
+            latitude=item.get("lat"),
+            longitude=item.get("lon"),
+            name=item.get("Bezeichnung"),
+            phone=item.get("Telefon"),
+            school_type=item.get("Schulform"),
+            website=item.get("Homepage"),
+            zip=item.get("PLZ"),
         )