Fixes #22: corrects the attributes of a seamark:notice.

go-spatial · Feb 20, 2018 · 1468ad0 · 1468ad0
1 parent 9022474
commit 1468ad0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/seamark.toml b/seamark.toml
@@ -343,7 +343,7 @@ password = "${SM_DB_PASS}"
 	name = "notice"
 	geometry_fieldname = "geometry"
 	id_fieldname = "osm_id"
-	sql = "SELECT ST_AsBinary(geometry) AS geometry, osm_id, type, name, addition, category, condition, distance_min, distance_max, distance_up, distance_down, function, impact, system FROM osm_notice WHERE geometry && !BBOX!"
+	sql = "SELECT ST_AsBinary(geometry) AS geometry, osm_id, type, name, addition, bank, category, direction, distance_down, distance_end, distance_start, distance_up, function, orientation, system FROM osm_notice WHERE geometry && !BBOX!"
 
 	[[providers.layers]]
 	name = "obstruction_points"

diff --git a/seamark.yml b/seamark.yml
@@ -917,14 +917,15 @@ tables:
     - {type: mapping_value, name: type, key: null}
     - {key: name, name: name, type: string}
     - {key: "seamark:notice:addition", name: addition, type: string}
+    - {key: "seamark:notice:bank", name: bank, type: string}
     - {key: "seamark:notice:category", name: category, type: string}
-    - {key: "seamark:notice:condition", name: condition, type: string}
-    - {key: "seamark:notice:distance_min", name: distance_min, type: string}
-    - {key: "seamark:notice:distance_max", name: distance_max, type: string}
-    - {key: "seamark:notice:distance_up", name: distance_up, type: string}
+    - {key: "seamark:notice:direction", name: direction, type: string}
     - {key: "seamark:notice:distance_down", name: distance_down, type: string}
+    - {key: "seamark:notice:distance_end", name: distance_end, type: string}
+    - {key: "seamark:notice:distance_start", name: distance_start, type: string}
+    - {key: "seamark:notice:distance_up", name: distance_up, type: string}
     - {key: "seamark:notice:function", name: function, type: string}
-    - {key: "seamark:notice:impact", name: impact, type: string}
+    - {key: "seamark:notice:orientation", name: orientation, type: string}
     - {key: "seamark:notice:system", name: system, type: string}
 
   obstruction_points: # OBSTRN: In marine navigation, anything that hinders or prevents movement, particularly anything that endangers or prevents passage of a vessel.