You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by bc...@apache.org on 2023/01/12 23:45:52 UTC
[incubator-baremaps] branch simplify-geometries updated (a4b29da1 -> 3a343794)
This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a change to branch simplify-geometries
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
discard a4b29da1 Implement the map interface
discard 0b7c265c Make the the AppendOnlyStore a Collection
discard 14b5691a Improve the collection package
discard 965c558a Add feature abstractions
add 6410f7f1 Put back in place the extrusion example (#567)
add 48b1ce7a Simplify the design of the geocoder (#563)
add 9bfb661a Add feature abstractions
add 5e025826 Improve the collection package
add 1568c1e3 Make the the AppendOnlyStore a Collection
add 3a343794 Implement the map interface
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a4b29da1)
\
N -- N -- N refs/heads/simplify-geometries (3a343794)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
...rth-create.run.xml => extrusion-create.run.xml} | 4 +-
...uralearth-dev.run.xml => extrusion-dev.run.xml} | 4 +-
.run/geocoder-create.run.xml | 2 +-
.run/geocoder-serve.run.xml | 2 +-
.run/iploc-create.run.xml | 2 +-
.run/iploc-serve.run.xml | 2 +-
.../org/apache/baremaps/cli/geocoder/Search.java | 46 +++++--
.../org/apache/baremaps/cli/geocoder/Serve.java | 42 +++---
baremaps-core/pom.xml | 10 +-
.../org/apache/baremaps/geocoder/Geocoder.java | 126 ------------------
.../GeocoderConstants.java} | 15 ++-
.../baremaps/geocoder/GeonamesDocumentMapper.java | 53 ++++++++
.../baremaps/geocoder/GeonamesQueryBuilder.java | 78 +++++++++++
.../apache/baremaps/geocoder/GeonamesReader.java | 69 ++++++++++
.../geocoder/{geonames => }/GeonamesRecord.java | 8 +-
.../geocoder/{utils => }/IsoCountriesUtils.java | 13 +-
.../geocoder/geonames/GeonamesGeocoder.java | 118 -----------------
.../apache/baremaps/geocoder/request/Request.java | 53 --------
.../apache/baremaps/geocoder/response/Data.java | 90 -------------
.../baremaps/geocoder/response/Response.java | 17 ---
.../apache/baremaps/geocoder/response/Result.java | 16 ---
.../main/java/org/apache/baremaps/iploc/IpLoc.java | 65 ++++++----
.../database/InetnumLocationDaoSqliteImpl.java | 4 -
.../apache/baremaps/openstreetmap/OsmReader.java | 3 +-
.../function/OpenstreetmapDocumentMapper.java | 71 +++++++++++
.../workflow/tasks/CreateGeonamesIndex.java | 43 +++++--
.../baremaps/workflow/tasks/CreateIplocIndex.java | 103 +++++++--------
.../org/apache/baremaps/geocoder/GeocoderTest.java | 79 ------------
.../GeonamesReaderTest.java} | 25 +++-
.../geocoder/geonames/GeonamesGeocoderTest.java | 73 -----------
.../java/org/apache/baremaps/iploc/IpLocTest.java | 21 +--
.../apache/baremaps/server/GeocoderResources.java | 68 +++++++---
.../src/main/resources/geocoder/index.html | 142 +++++++--------------
examples/{contour => extrusion}/README.md | 0
examples/{openstreetmap => extrusion}/indexes.sql | 0
examples/extrusion/style.json | 31 +++++
examples/extrusion/tileset.json | 31 +++++
.../{openstreetmap => extrusion}/workflow.json | 6 +-
examples/geocoding/workflow.js | 4 +-
examples/ip-to-location/workflow.js | 73 ++++++++---
pom.xml | 10 +-
41 files changed, 730 insertions(+), 892 deletions(-)
copy .run/{naturalearth-create.run.xml => extrusion-create.run.xml} (74%)
copy .run/{naturalearth-dev.run.xml => extrusion-dev.run.xml} (79%)
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/geocoder/Geocoder.java
copy baremaps-core/src/main/java/org/apache/baremaps/{openstreetmap/model/Entity.java => geocoder/GeocoderConstants.java} (67%)
create mode 100644 baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesDocumentMapper.java
create mode 100644 baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesQueryBuilder.java
create mode 100644 baremaps-core/src/main/java/org/apache/baremaps/geocoder/GeonamesReader.java
rename baremaps-core/src/main/java/org/apache/baremaps/geocoder/{geonames => }/GeonamesRecord.java (97%)
rename baremaps-core/src/main/java/org/apache/baremaps/geocoder/{utils => }/IsoCountriesUtils.java (74%)
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/geocoder/geonames/GeonamesGeocoder.java
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/geocoder/request/Request.java
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/geocoder/response/Data.java
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/geocoder/response/Response.java
delete mode 100644 baremaps-core/src/main/java/org/apache/baremaps/geocoder/response/Result.java
create mode 100644 baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/function/OpenstreetmapDocumentMapper.java
delete mode 100644 baremaps-core/src/test/java/org/apache/baremaps/geocoder/GeocoderTest.java
copy baremaps-core/src/test/java/org/apache/baremaps/{workflow/tasks/SimplifyOpenStreetMapTest.java => geocoder/GeonamesReaderTest.java} (52%)
delete mode 100644 baremaps-core/src/test/java/org/apache/baremaps/geocoder/geonames/GeonamesGeocoderTest.java
copy examples/{contour => extrusion}/README.md (100%)
copy examples/{openstreetmap => extrusion}/indexes.sql (100%)
create mode 100644 examples/extrusion/style.json
create mode 100644 examples/extrusion/tileset.json
copy examples/{openstreetmap => extrusion}/workflow.json (77%)