Skip to content

Commit

Permalink
Closed way now assumes geom type Area if schema allows it (#2734)
Browse files Browse the repository at this point in the history
* failing tests identifying defects

refs #2693

* Update README.md

* Cleanup XXX, XXX2, XXX3 etc attributes (#2684)

* Initial changes

refs: #2683

* Test fixes.

refs: #2683

* Test fix

refs: #2683

* Append to dataset now appends (#2698)

* Added flags to dataset opening

refs: #2697

* Debugging added.

refs: #2697

* Added a test

refs: #2697

* Fixed copyright.

refs: #2697

* add an area geometry situation for power tag

refs #2683

* add test and post processor for riverbank

refs #2693

* Fixed AK030

refs: #2693

* wip area translation fixes

* test runway

* comment out last tds->osm step

* Updated the element converter to assign closed areas the polygon attribute

* add F_CODE aliases, make waterway=riverbank only area, log attrs and geomType

* set test with failing F_CODE/WCC combo for river

* add aliases for all FCODES in schema

* remove debug logging

* enable passing tests

* Created unit tests for ElementConverter and found some issues with OsmSchema::allowsFor()

* add more translation tests, disable logging

* don't translate timestamp to source:datetime for translation server

* Schema changes for geometries (#2740)

* Removed geometry from schema that don't describe geometries and updated OsmSchema::allowsFor() code to ignore empty geometries

* Updated schema checker and copyright.

* Add REST endpoint to describe current session user (#2724)

* Add REST endpoint to describe current session user

refs #2590

* add method for retrieving currently authenticated user
* cleanup other user URIs

* Add REST endpoint to describe current session user

refs #2590

* simplify user serialization
* make some URIs Content-Type aware for xml/json serialization
    * /user/<id>
    * /user/name/<name>
* add deprecated annoation to getSaveUser
* adjust use resource testing http status codes

* copyright

* Add REST endpoint to describe current session user

refs #2590

* make OSM_API_DB public
* fix bug that caused intermittent UI test failures
    * update auth proxy http parser to fix error HPE_UNEXPECTED_CONTENT_LENGTH
        * request/request#2761
        * https://github.com/creationix/http-parser-js

* Remove renderdb creation and node-mapnik-server

refs #2700

* update ui-test dom qualifier

* remove inadvertent addition

* advance hoot-ui commit hash

* Add REST endpoint to describe current session user

refs #2590

* advance hoot-ui commit hash
* randomize test user's user_id to prevent possible conflicts with widely used -1

* Submodule hoot-ui a687db8...100a980 (commits not present)

* Update VAGRANT.md

* Add node conversion to GeometryConverter to fix cropping crash (#2738)

* Add string comps and val aggs to info command (#2737)

* add string comparison and value aggregator class descriptions to the info command

* add manual match count to score-matches output (#2739)

* Removed more schema geometries from non-geometric tags

* Update copyright
  • Loading branch information
brianhatchl authored Nov 9, 2018
1 parent 74a0194 commit bd1b0bb
Show file tree
Hide file tree
Showing 41 changed files with 1,095 additions and 657 deletions.
890 changes: 439 additions & 451 deletions conf/schema/FCODE.json

Large diffs are not rendered by default.

7 changes: 1 addition & 6 deletions conf/schema/REF1.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"influence": 1,
"name": "REF1",
"objectType": "tag"
}
]
]
7 changes: 1 addition & 6 deletions conf/schema/REF2.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"influence": 1,
"name": "REF2",
"objectType": "tag"
}
]
]
6 changes: 0 additions & 6 deletions conf/schema/address.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"area",
"way",
"relation"
],
"influence": 2,
"mismatchScore": 0.25,
"name": "abstract_address",
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/colour.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"name": "colour",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/contact.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"name": "contact:phone",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/destination.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"name": "destination",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/ele.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "real",
"geometries": [
"node",
"way",
"relation"
],
"name": "ele",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/email.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"name": "email",
"objectType": "tag"
}
Expand Down
4 changes: 0 additions & 4 deletions conf/schema/fire_hydrant.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
[
{
"dataType": "real",
"geometries": [
"node",
"way"
],
"name": "fire_hydrant:diameter",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/frequency.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "real",
"geometries": [
"node",
"way",
"relation"
],
"name": "frequency",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/gauge.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "real",
"geometries": [
"node",
"way",
"relation"
],
"name": "gauge",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/height.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "real",
"geometries": [
"node",
"way",
"relation"
],
"name": "height",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/hoot_tags.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"influence": 1,
"isA": "metadata",
"name": "hoot:hash",
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/is_in.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"name": "abstract_is_in",
"influence": 1,
"objectType": "tag"
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/lanes.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "int",
"geometries": [
"node",
"way",
"relation"
],
"name": "lanes",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/maxspeed.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "real",
"geometries": [
"node",
"way",
"relation"
],
"name": "maxspeed",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/metadata.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"influence": 0,
"name": "metadata",
"objectType": "tag"
Expand Down
10 changes: 0 additions & 10 deletions conf/schema/name.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
"name"
],
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"influence": 2,
"name": "abstract_name",
"objectType": "tag"
Expand Down Expand Up @@ -58,11 +53,6 @@
"pseudoname"
],
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"influence": 1,
"name": "pseudo_name",
"objectType": "tag"
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/note.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"influence": 0,
"name": "note",
"objectType": "tag"
Expand Down
4 changes: 0 additions & 4 deletions conf/schema/opening_hours.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way"
],
"name": "opening_hours",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/source.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
},
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"influence": 1,
"isA": "metadata",
"name": "source",
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/url.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"name": "url",
"objectType": "tag"
}
Expand Down
3 changes: 3 additions & 0 deletions conf/schema/waterway.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@
"objectType": "tag"
},
{
"geometries": [
"area"
],
"isA": "waterway",
"name": "waterway=riverbank",
"objectType": "tag"
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/website.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"name": "website",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/width.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "real",
"geometries": [
"node",
"way",
"relation"
],
"name": "width",
"objectType": "tag"
}
Expand Down
5 changes: 0 additions & 5 deletions conf/schema/wikipedia.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[
{
"dataType": "text",
"geometries": [
"node",
"way",
"relation"
],
"name": "wikipedia",
"objectType": "tag"
}
Expand Down
Loading

0 comments on commit bd1b0bb

Please sign in to comment.