water-fountains#146 remove deprecated id_operator

server/api/controllers/controller.ts

@@ -34,7 +34,7 @@ import {
 import sharedConstants from './../../common/shared-constants';
 import { Request, Response } from 'express';
 import { getSingleBooleanQueryParam, getSingleNumberQueryParam, getSingleStringQueryParam } from './utils';
-import { Fountain, FountainCollection, GalleryValue } from '../../common/typealias';
+import { Fountain, FountainCollection, GalleryValue, isDatabase } from '../../common/typealias';
 import { hasWikiCommonsCategories } from '../../common/wikimedia-types';
 import { ImageLike } from '../../../config/text2img';
 
@@ -251,6 +251,11 @@ function sendJson(resp: Response, obj: Record<string, any> | undefined, dbg: str
  */
 function byId(req: Request, res: Response, dbg: string): Promise<Fountain | undefined> {
   const city = getSingleStringQueryParam(req, 'city');
+  const database = getSingleStringQueryParam(req, 'database');
+  if (!isDatabase(database)) {
+    return new Promise((_, reject) => reject('unsupported database given: ' + database));
+  }
+
   let name = 'unkNamById';
   //  l.info('controller.js byId: '+cityS+' '+dbg);
   let fountainCollection = cityCache.get<FountainCollection>(city);
@@ -270,7 +275,7 @@ function byId(req: Request, res: Response, dbg: string): Promise<Fountain | unde
         }
         if (fountainCollection !== undefined) {
           const fountain = fountainCollection.features.find(
-            f => f.properties['id_' + req.query.database]?.value === req.query.idval
+            f => f.properties['id_' + database]?.value === req.query.idval
           );
           const imgMetaPromises: Promise<any>[] = [];
           let lazyAdded = 0;

server/api/services/database.service.ts

@@ -114,11 +114,7 @@ function replaceFountain(
 
 function isMatch(f1: Fountain, f2: Fountain): boolean {
   // returns true if match, otherwise returns distance
-  const ids = ['id_wikidata', 'id_operator', 'id_osm'];
-  for (const id_name of ids) {
-    if (f1.properties && f2.properties && f1.properties[id_name].value === f2.properties[id_name].value) {
-      return true;
-    }
-  }
-  return false;
+  return ['id_wikidata', 'id_osm'].some(idName => {
+    f1.properties && f2.properties && f1.properties[idName].value === f2.properties[idName].value;
+  });
 }

server/common/build.info.ts

@@ -1,9 +1,9 @@
 // this file is automatically generated by git.version.js script
 const buildInfo = {
   version: '',
-  revision: '82e1956',
+  revision: 'c6dfade',
   branch: 'develop',
-  commit_time: '2021-10-18 20:23:30 +0200',
-  build_time: 'Wed Oct 27 2021 10:04:56 GMT+0200 (Central European Summer Time)',
+  commit_time: '2021-10-27 08:30:58 +0000',
+  build_time: 'Fri Dec 17 2021 23:35:27 GMT+0100 (Central European Standard Time)',
 };
 export default buildInfo;

server/common/swagger/Api.yaml

@@ -1,4 +1,4 @@
-swagger: "2.0"
+swagger: '2.0'
 info:
   version: 1.0.0
   title: datablue
@@ -18,7 +18,6 @@ produces:
   - application/json
   - text/html
 
-
 definitions:
   ExampleBody:
     type: object
@@ -33,25 +32,25 @@ definitions:
 paths:
   /metadata/fountain_properties:
     get:
-      description: "Fetch general metadata for fountain properties. For example: whether OpenStreetMap or Wikidata are preferred places to store the information."
+      description: 'Fetch general metadata for fountain properties. For example: whether OpenStreetMap or Wikidata are preferred places to store the information.'
       responses:
         200:
           description: Returns property metadata.
 
   /metadata/locations:
     get:
-      description: "Fetch general metadata for locations, including bounds and official operator information."
+      description: 'Fetch general metadata for locations, including bounds and official operator information.'
       responses:
         200:
           description: Returns location metadata.
 
   /metadata/shared-constants:
     get:
-      description: "Fetch shared consants between Datablue and Proximap."
+      description: 'Fetch shared consants between Datablue and Proximap.'
       responses:
         200:
           description: Returns shared constants.
-          
+
   /fountain:
     get:
       description: Fetch detailed fountain information based on coordinates or identifier
@@ -66,7 +65,7 @@ paths:
         - name: database
           in: query
           type: string
-          enum: [datablue, operator, wikidata, osm]
+          enum: [wikidata, osm]
           example: wikidata
           description: database for which the provided identifier is valid
         - name: city
@@ -153,7 +152,7 @@ paths:
       responses:
         200:
           description: Returns  the build information.
-      
+
   /spec:
     get:
       tags:

server/common/typealias.ts

@@ -127,4 +127,12 @@ export interface SourceConfig<V, RE> {
 // if you change something here, then you need to change it in proximap as well
 //TODO @ralfhauser looks suspicious/buggy to me, IMO we always know that it is either osm or wikidata, shall I change/fix this?
 // this currently occurs if metadata.src_config['osm'] or metadata.src_config['wikidata'] returns null in conflate.data.service.ts
-export type SourceType = 'osm' | 'wikidata' | '';
+export type SourceType = keyof NamedSources<unknown, unknown> | '';
+
+// TODO it would make more sense to move common types to an own library which is consumed by both, datablue and proximap
+// if you change something here, then you need to change it in datablue as well
+export type Database = SourceType;
+
+export function isDatabase(d: string): d is Database {
+  return d === 'osm' || d === 'wikidata';
+}