From ca66c0a3334a8dd6864ee18f7c721244b4f20c08 Mon Sep 17 00:00:00 2001 From: Rhys Kidd Date: Sat, 27 Jan 2018 15:21:39 -0500 Subject: [PATCH 1/4] Dockerfile: Update to current Pelias contact email address Per https://github.com/pelias/pelias/tree/master/announcements/2018-01-02-pelias-update replace @mapzen.com email address in Dockerfile with the current Pelias contact email address. For example this will be visible from `docker inspect` with the other labels. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e28228c3..0f0eefe1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM pelias/baseimage # maintainer information -LABEL maintainer="pelias@mapzen.com" +LABEL maintainer="pelias.team@gmail.com" EXPOSE 3100 From 1dfc6988ed285891d5f043150b2b7f52c1d6622f Mon Sep 17 00:00:00 2001 From: Rhys Kidd Date: Sat, 27 Jan 2018 15:24:41 -0500 Subject: [PATCH 2/4] Update to current Pelias contact email address Per https://github.com/pelias/pelias/tree/master/announcements/2018-01-02-pelias-update replace all @mapzen.com email addresses with the current Pelias contact email address. grep used to confirm no '@mapzen.com' remain. --- sanitizer/_deprecate_quattroshapes.js | 2 +- test/ciao/reverse/sources_deprecation_warning.coffee | 2 +- test/ciao/search/sources_deprecation_warning.coffee | 2 +- test/unit/sanitizer/_deprecate_quattroshapes.js | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sanitizer/_deprecate_quattroshapes.js b/sanitizer/_deprecate_quattroshapes.js index 50f3af8e..1db2fef1 100644 --- a/sanitizer/_deprecate_quattroshapes.js +++ b/sanitizer/_deprecate_quattroshapes.js @@ -26,7 +26,7 @@ function _sanitize( raw, clean, opts ) { 'replaced by Who\'s on First, an actively maintained data project based on Quattroshapes' + 'Your existing queries WILL CONTINUE TO WORK for the foreseeable future, but results will ' + 'be coming from Who\'s on First and `sources=quattroshapes` will be interpreted as ' + - '`sources=whosonfirst`. If you have any questions, please email search@mapzen.com.'); + '`sources=whosonfirst`. If you have any questions, please email pelias.team@gmail.com.'); // user requested 'quattroshapes', we will give them 'whosonfirst' instead. sources = _.without(sources, 'quattroshapes', 'qs'); diff --git a/test/ciao/reverse/sources_deprecation_warning.coffee b/test/ciao/reverse/sources_deprecation_warning.coffee index 45c2c967..51445800 100644 --- a/test/ciao/reverse/sources_deprecation_warning.coffee +++ b/test/ciao/reverse/sources_deprecation_warning.coffee @@ -27,7 +27,7 @@ should.not.exist json.geocoding.errors #? expected warnings should.exist json.geocoding.warnings -json.geocoding.warnings.should.eql ['You are using Quattroshapes as a data source in this query. Quattroshapes has been disabled as a data source for Mapzen Search, and has beenreplaced by Who\'s on First, an actively maintained data project based on QuattroshapesYour existing queries WILL CONTINUE TO WORK for the foreseeable future, but results will be coming from Who\'s on First and `sources=quattroshapes` will be interpreted as `sources=whosonfirst`. If you have any questions, please email search@mapzen.com.' ] +json.geocoding.warnings.should.eql ['You are using Quattroshapes as a data source in this query. Quattroshapes has been disabled as a data source for Mapzen Search, and has beenreplaced by Who\'s on First, an actively maintained data project based on QuattroshapesYour existing queries WILL CONTINUE TO WORK for the foreseeable future, but results will be coming from Who\'s on First and `sources=quattroshapes` will be interpreted as `sources=whosonfirst`. If you have any questions, please email pelias.team@gmail.com.' ] #? inputs json.geocoding.query['size'].should.eql 10 diff --git a/test/ciao/search/sources_deprecation_warning.coffee b/test/ciao/search/sources_deprecation_warning.coffee index c6d96a2c..fe82d298 100644 --- a/test/ciao/search/sources_deprecation_warning.coffee +++ b/test/ciao/search/sources_deprecation_warning.coffee @@ -27,7 +27,7 @@ should.not.exist json.geocoding.errors #? expected warnings should.exist json.geocoding.warnings -json.geocoding.warnings.should.eql ['You are using Quattroshapes as a data source in this query. Quattroshapes has been disabled as a data source for Mapzen Search, and has beenreplaced by Who\'s on First, an actively maintained data project based on QuattroshapesYour existing queries WILL CONTINUE TO WORK for the foreseeable future, but results will be coming from Who\'s on First and `sources=quattroshapes` will be interpreted as `sources=whosonfirst`. If you have any questions, please email search@mapzen.com.' ] +json.geocoding.warnings.should.eql ['You are using Quattroshapes as a data source in this query. Quattroshapes has been disabled as a data source for Mapzen Search, and has beenreplaced by Who\'s on First, an actively maintained data project based on QuattroshapesYour existing queries WILL CONTINUE TO WORK for the foreseeable future, but results will be coming from Who\'s on First and `sources=quattroshapes` will be interpreted as `sources=whosonfirst`. If you have any questions, please email pelias.team@gmail.com.' ] #? inputs json.geocoding.query['size'].should.eql 10 diff --git a/test/unit/sanitizer/_deprecate_quattroshapes.js b/test/unit/sanitizer/_deprecate_quattroshapes.js index d468b97f..6cbe1f09 100644 --- a/test/unit/sanitizer/_deprecate_quattroshapes.js +++ b/test/unit/sanitizer/_deprecate_quattroshapes.js @@ -15,7 +15,7 @@ module.exports.tests.warning_message_1 = function(test, common) { 'replaced by Who\'s on First, an actively maintained data project based on Quattroshapes' + 'Your existing queries WILL CONTINUE TO WORK for the foreseeable future, but results will ' + 'be coming from Who\'s on First and `sources=quattroshapes` will be interpreted as ' + - '`sources=whosonfirst`. If you have any questions, please email search@mapzen.com.'] + '`sources=whosonfirst`. If you have any questions, please email pelias.team@gmail.com.'] }, 'warning emitted'); t.end(); @@ -35,7 +35,7 @@ module.exports.tests.warning_message_2 = function(test, common) { 'replaced by Who\'s on First, an actively maintained data project based on Quattroshapes' + 'Your existing queries WILL CONTINUE TO WORK for the foreseeable future, but results will ' + 'be coming from Who\'s on First and `sources=quattroshapes` will be interpreted as ' + - '`sources=whosonfirst`. If you have any questions, please email search@mapzen.com.'] + '`sources=whosonfirst`. If you have any questions, please email pelias.team@gmail.com.'] }, 'warning emitted'); t.end(); From c2b86f305ad9378ad934b820008aa69ffd0d78fe Mon Sep 17 00:00:00 2001 From: Rhys Kidd Date: Sat, 27 Jan 2018 16:12:57 -0500 Subject: [PATCH 3/4] Add MIT license pelias-api never previously had a LICENSE, although it appears clear from contextual information that the intention was for pelias-api to be MIT licensed (e.g. metadata in package.json to this effect). Copy over MIT license as formatted in the pelias/pelias meta repository. --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..d2a640a9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Mapzen + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file From 466eb12a615e93fd45b6cb4c8744353825059089 Mon Sep 17 00:00:00 2001 From: Rhys Kidd Date: Mon, 29 Jan 2018 21:27:19 -0500 Subject: [PATCH 4/4] Update to current upstream Who's On First URL grep used to confirm no other direct whosonfirst.mapzen.com links remain. --- public/attribution.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/attribution.md b/public/attribution.md index 0eedb365..009450f6 100644 --- a/public/attribution.md +++ b/public/attribution.md @@ -4,4 +4,4 @@ * [OpenStreetMap](http://www.openstreetmap.org/copyright) © OpenStreetMap contributors under [ODbL](http://opendatacommons.org/licenses/odbl/) * [OpenAddresses](http://openaddresses.io) under a [Creative Commons Zero](https://github.com/openaddresses/openaddresses/blob/master/sources/LICENSE) public domain designation * [GeoNames](http://www.geonames.org/) under [CC-BY-3.0](https://creativecommons.org/licenses/by/2.0/) - * [WhosOnFirst](http://whosonfirst.mapzen.com) under [various licenses](https://github.com/whosonfirst/whosonfirst-data/blob/master/LICENSE.md) + * [WhosOnFirst](https://www.whosonfirst.org/) under [various licenses](https://github.com/whosonfirst/whosonfirst-data/blob/master/LICENSE.md)