Merge branch 'develop'

2019-12-19 12:31:23 +01:00 · 2019-12-19 12:31:23 +01:00 · 3e22e856ac
commit 3e22e856ac
parent e1c3bac244 d0104560de
2 changed files with 6 additions and 6 deletions
--- a/assets/config/labels.yml
+++ b/assets/config/labels.yml
@ -1843,16 +1843,16 @@ aircraft carrier:
    - vehicle

 airliner:
+  label: aircraft
  categories:
-    - aircraft
-    - fly
+    - airport
    - vehicle

 airship:
+  label: aircraft
  threshold: 0.5
  categories:
-    - aircraft
-    - fly
+    - airport
    - vehicle

 ambulance:
--- a/internal/entity/location.go
+++ b/internal/entity/location.go
@ -27,8 +27,8 @@ var locTypeLabels = map[string]string{
 	"residential": "residential area",
 	"museum": "museum",
 	"castle": "castle",
-	"terminal": "airport terminal",
-	"ferry terminal": "ferry terminal",
+	"terminal": "airport",
+	"ferry terminal": "harbor",
 	"bridge": "bridge",
 	"university": "university",
 	"mall": "mall",