aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config.yml16
-rw-r--r--import_source.py2
-rw-r--r--schema.sql9
3 files changed, 7 insertions, 20 deletions
diff --git a/config.yml b/config.yml
index 52512ce..744122a 100644
--- a/config.yml
+++ b/config.yml
@@ -244,7 +244,7 @@ downloads:
- Samebyarnas_betesomraden.zip
- Samebyarnas_markanvandningsredovisning.zip
- - basedir: ren/
+ - basedir: sametinget/
baseurl: https://ext-dokument.lansstyrelsen.se/gemensamt/geodata/ShapeExport/
files:
- ren.riks_ren.zip
@@ -487,14 +487,14 @@ license-info:
license:
name: CC0 1.0 Universiell
url: https://creativecommons.org/publicdomain/zero/1.0/deed.sv
- ren/ren.riks_ren.zip:
+ sametinget/ren.riks_ren.zip:
description: "Riksintresse Rennäringen"
copyright: © Sametinget
product_url: https://ext-geodatakatalog-forv.lansstyrelsen.se/PlaneringsKatalogen/GetMetaDataById?id=103cf137-9d56-452b-97d6-9b12cba6c864_C
license:
name: CC BY 4.0
url: https://creativecommons.org/licenses/by/4.0/deed.sv
- ren/ren.omr_riks.zip:
+ sametinget/ren.omr_riks.zip:
description: "Riksintresse Rennäringen - Kärnområde"
copyright: © Sametinget
product_url: https://ext-geodatakatalog-forv.lansstyrelsen.se/PlaneringsKatalogen/GetMetaDataById?id=b665a528-cd25-4612-8ab3-fa3e692b46c3_C
@@ -2597,11 +2597,6 @@ layers:
create:
geometry-type: MULTIPOLYGON
fields:
- - name: OBJECTID
- type: Integer
- unique: true
- nullable: false
- comment: Unik identitet
- name: NAMN
type: String
width: 62
@@ -2611,6 +2606,7 @@ layers:
- name: DOS_ID
type: Integer
source:
+ # XXX Unfortunately only Norrbotten (lstBD) provides this right now
path: lst/lstext.Pagaende_reservatsbildning.zip
unar:
format: zip
@@ -2960,7 +2956,7 @@ layers:
unique: true
nullable: false
source:
- path: ren/ren.riks_ren.zip
+ path: sametinget/ren.riks_ren.zip
unar:
format: zip
patterns:
@@ -3014,7 +3010,7 @@ layers:
unique: true
nullable: false
source:
- path: ren/ren.omr_riks.zip
+ path: sametinget/ren.omr_riks.zip
unar:
format: zip
patterns:
diff --git a/import_source.py b/import_source.py
index 16284b9..0431486 100644
--- a/import_source.py
+++ b/import_source.py
@@ -216,7 +216,7 @@ def createOutputLayer(ds : gdal.Dataset,
defn.SetUnique(v)
if lyr.CreateField(defn, approx_ok=False) != gdalconst.CE_None:
- raise RuntimeError('Could not create field "{fldName}"')
+ raise RuntimeError(f'Could not create field "{fldName}"')
logging.debug('Added field "%s" to output layer "%s"', fldName, layername)
# sync before calling StartTransaction() so we're not trying to rollback changes
diff --git a/schema.sql b/schema.sql
index 1a65924..b9896fd 100644
--- a/schema.sql
+++ b/schema.sql
@@ -437,7 +437,6 @@ ALTER SEQUENCE postgis.lansyta_sub_ogc_fid_seq OWNED BY postgis.lansyta_sub.ogc_
CREATE TABLE postgis."lst:pagaende_naturreservatsbildning" (
ogc_fid bigint NOT NULL,
- "OBJECTID" integer NOT NULL,
"NAMN" character varying(62) NOT NULL,
"GRANSJUST" date,
"DOS_ID" integer,
@@ -4100,14 +4099,6 @@ ALTER TABLE ONLY postgis.lansyta
--
--- Name: lst:pagaende_naturreservatsbildning lst:pagaende_naturreservatsbildning_OBJECTID_key; Type: CONSTRAINT; Schema: postgis; Owner: webmap_import
---
-
-ALTER TABLE ONLY postgis."lst:pagaende_naturreservatsbildning"
- ADD CONSTRAINT "lst:pagaende_naturreservatsbildning_OBJECTID_key" UNIQUE ("OBJECTID");
-
-
---
-- Name: lst:pagaende_naturreservatsbildning lst:pagaende_naturreservatsbildning_pkey; Type: CONSTRAINT; Schema: postgis; Owner: webmap_import
--