changeset 5886:6a63456b99d9

Schema change, importer, i18n: additional field for federal state stations
author Tom Gottfried <tom.gottfried@intevation.de>
date Tue, 30 Apr 2013 19:27:15 +0200 (2013-04-30)
parents 09d9c14145a3
children 88fca576e9e6
files backend/contrib/shpimporter/km.py backend/doc/schema/oracle-spatial.sql backend/doc/schema/postgresql-spatial.sql gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties
diffstat 6 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/backend/contrib/shpimporter/km.py	Tue Apr 30 19:03:44 2013 +0200
+++ b/backend/contrib/shpimporter/km.py	Tue Apr 30 19:27:15 2013 +0200
@@ -46,6 +46,9 @@
         else:
             newFeat.SetField("river_id", self.river_id)
 
+        if self.IsDoubleFieldSet(feat, "landkm"):
+            newFeat.SetField("fedstate_km", feat.GetFieldAsDouble("landkm"))
+
         if self.IsDoubleFieldSet(feat, "km"):
             newFeat.SetField("km", feat.GetFieldAsDouble("km"))
         elif self.IsDoubleFieldSet(feat, "KM"):
--- a/backend/doc/schema/oracle-spatial.sql	Tue Apr 30 19:03:44 2013 +0200
+++ b/backend/doc/schema/oracle-spatial.sql	Tue Apr 30 19:27:15 2013 +0200
@@ -35,6 +35,7 @@
     GEOM MDSYS.SDO_GEOMETRY,
     river_id NUMBER(38) REFERENCES rivers(id) ON DELETE CASCADE,
     km NUMBER(7,3) NOT NULL,
+    fedstate_km NUMBER(7,3),
     name     VARCHAR(64),
     path     VARCHAR(256),
     ID NUMBER PRIMARY KEY NOT NULL
--- a/backend/doc/schema/postgresql-spatial.sql	Tue Apr 30 19:03:44 2013 +0200
+++ b/backend/doc/schema/postgresql-spatial.sql	Tue Apr 30 19:27:15 2013 +0200
@@ -28,6 +28,7 @@
     id       int PRIMARY KEY NOT NULL,
     river_id int REFERENCES rivers(id) ON DELETE CASCADE,
     km       FLOAT8 NOT NULL,
+    fedstate_km FLOAT8,
     name     VARCHAR(64),
     path     VARCHAR(256)
 );
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Tue Apr 30 19:03:44 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Tue Apr 30 19:27:15 2013 +0200
@@ -1288,5 +1288,6 @@
 
     String WATERBODY();
 
+    String FEDSTATE_KM();
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Tue Apr 30 19:03:44 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Tue Apr 30 19:27:15 2013 +0200
@@ -674,3 +674,4 @@
 DIFF = DIFF
 SOURCE = Source
 WATERBODY = Waterbody
+FEDSTATE_KM = Station (Federal State)
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Tue Apr 30 19:03:44 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Tue Apr 30 19:27:15 2013 +0200
@@ -673,3 +673,4 @@
 DIFF = DIFF
 SOURCE = Quelle
 WATERBODY = Gewässer
+FEDSTATE_KM = Landes-Stationierung

http://dive4elements.wald.intevation.org