update overpass

Author: root

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "svelte.svelte-vscode"
+    ]
+}

src/lib/util/index.js

@@ -0,0 +1,3 @@
+export { default as exportToGeoJsonFile } from './exportToGeoJsonFile';
+export { default as fileToGeoJSON } from './fileToGeoJSON';
+export { default as geoJsonToPolygon } from './geoJsonToPolygon';

src/lib/util/fetchOverpass.ts src/lib/util/overpass/fetchOverpass.ts

@@ -9,5 +9,10 @@ export default async (query) => {
     }
   );
 
+  if (!result.ok) {
+    const message = `An error has occured: ${result.status}`;
+    throw new Error(message);
+  }
+
   return await result.json();
 };

src/lib/util/overpass/index.js

@@ -1 +1,3 @@
 export { default as config } from './config.json';
+export { default as fetchOverpass } from './fetchOverpass';
+export { default as queryAndDownload } from './queryAndDownload';

src/lib/util/queryAndDownload.ts src/lib/util/overpass/queryAndDownload.ts

@@ -1,14 +1,12 @@
-import exportToGeoJsonFile from '$lib/util/exportToGeoJsonFile';
-import fetchOverpass from '$lib/util/fetchOverpass';
-import fileToGeoJSON from '$lib/util/fileToGeoJson';
-import geoJSONToPolygon from '$lib/util/geoJsonToPolygon';
-import { AllGeoJSON, feature, featureCollection, geometry, point, simplify } from '@turf/turf';
+import { AllGeoJSON, simplify } from '@turf/turf';
 import osmtogeojson from 'osmtogeojson';
+import { exportToGeoJsonFile, fileToGeoJSON, geoJsonToPolygon } from '$lib/util';
+import fetchOverpass from '$lib/util/overpass/fetchOverpass';
 
 export default async (file, overpassQuery: Array<any>, filename, radius = 1) => {
   let createdGeoJson: AllGeoJSON = await fileToGeoJSON(file);
 
-  let polygon = geoJSONToPolygon(createdGeoJson, radius);
+  let polygon = geoJsonToPolygon(createdGeoJson, radius);
   console.log(polygon);
 
   let simplifiedPolygon = simplify(polygon, { highQuality: true, mutate: false, tolerance: 0.05 });
@@ -24,11 +22,12 @@ export default async (file, overpassQuery: Array<any>, filename, radius = 1) =>
 
   overpassQuery.map(
     (overpassQueryObject) =>
-      (middleQuery += `way["${Object.keys(overpassQueryObject)[0]}"="${
+      (middleQuery += `nwr["${Object.keys(overpassQueryObject)[0]}"="${
         overpassQueryObject[Object.keys(overpassQueryObject)[0]]
       }"](poly:"${polygonstring}");`)
   );
-  const query = `[out:json][timeout:150];(${middleQuery});(._;>;);out meta;`;
+
+  const query = `[out:json][timeout:150];(${middleQuery});(._;>;);out center;`;
 
   const data = await fetchOverpass(query);
   console.log(data);

src/routes/index.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { FileInput, DownloadButton } from '$lib/components/index';
-  import queryAndDownload from '$lib/util/queryAndDownload';
+  import { queryAndDownload } from '$lib/util/overpass';
   import { config } from '$lib/util/overpass';
   import { fetchWikidata } from '$lib/util/wikidata';
   import exportToGeoJSONFile from '$lib/util/exportToGeoJsonFile';
@@ -54,7 +54,7 @@
           queryAndDownload(
             files[0],
             configuration.query,
-            files[0].name + ' --- ' + configuration.name,
+            `${removeFilenameExtention(files[0].name)}---${configuration.name}`,
             radiusInKm
           )}
         name={configuration.name}