Mercurial > gemma

changeset 699:18f6f2d89da1 octree

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged default into octree branch.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 20 Sep 2018 21:08:37 +0200
parents 37c08d8487c3 (current diff) 3da0ab06d5a0 (diff)
children fe0889460e97
files
diffstat 2 files changed, 27 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/client/tests/unit/geo/geo.spec.js	Thu Sep 20 15:50:42 2018 +0200
+++ b/client/tests/unit/geo/geo.spec.js	Thu Sep 20 21:08:37 2018 +0200
@@ -1,31 +1,31 @@
 import { prepareProfile } from "../../../src/application/lib/geo";
 
-const geoJSON = {
-  type: "Feature",
-  geometry: {
-    type: "MultiLineString",
-    coordinates: [
-      [
-        [17.216391563415527, 48.0245195664277, 123],
-        [17.216777801513672, 48.024720482272315, 124]
-      ],
-      [
-        [17.218494415283203, 48.02540933065123, 125],
-        [17.219438552856445, 48.02586855778941, 126],
-        [17.220726013183594, 48.02647128719908, 127],
-        [17.221627235412598, 48.026987906797494, 128],
-        [17.222957611083984, 48.02759062311748, 129],
-        [17.223901748657227, 48.0280785311666, 130],
-        [17.224159240722656, 48.02819333238926, 131]
-      ],
-      [
-        [17.225961685180664, 48.02891083423718, 132],
-        [17.227892875671383, 48.02997271864036, 133]
-      ]
-    ]
-  },
-  properties: {}
-};
+const geoJSON = JSON.parse(`{
+	"type": "Feature",
+	"geometry": {
+		"type": "MultiLineString",
+		"coordinates": [
+			[
+				[17.216391563415527, 48.0245195664277, 123],
+				[17.216777801513672, 48.024720482272315, 124]
+			],
+			[
+				[17.218494415283203, 48.02540933065123, 125],
+				[17.219438552856445, 48.02586855778941, 126],
+				[17.220726013183594, 48.02647128719908, 127],
+				[17.221627235412598, 48.026987906797494, 128],
+				[17.222957611083984, 48.02759062311748, 129],
+				[17.223901748657227, 48.0280785311666, 130],
+				[17.224159240722656, 48.02819333238926, 131]
+			],
+			[
+				[17.225961685180664, 48.02891083423718, 132],
+				[17.227892875671383, 48.02997271864036, 133]
+			]
+		]
+	},
+	"properties": {}
+}`);
 
 test("prepare diagram", () => {
   const coordinates = geoJSON.geometry.coordinates;
--- a/schema/gemma.sql	Thu Sep 20 15:50:42 2018 +0200
+++ b/schema/gemma.sql	Thu Sep 20 21:08:37 2018 +0200
@@ -289,7 +289,7 @@
                distance_mark_function,
                position_code,
                (location_code).hectometre
-            FROM waterway.distance_marks;
+            FROM waterway.distance_marks
 
     CREATE TABLE sections_stretches (
         id varchar PRIMARY KEY,