search

linz / gazetteer

New Zealand Gazetteer of official place names
http://www.linz.govt.nz/regulatory/place-names/find-name/new-zealand-gazetteer-official-geographic-names/new-zealand-gazetteer-search-place-names#zoom=0&lat=-41.14127&lon=172.5&layers=BTTT
Other
2 stars 2 forks source link

Remerge missing code #240

Closed billgeo closed 3 years ago

billgeo commented 3 years ago

Master branch has code missing from March 2020 to this commit

billgeo commented 3 years ago

@SPlanzer I've got it to a state where the pull_request CI tests are passing. Can you please review and approve and I'll create another PR with @iharrison's changes.

FYI - I've created a master-backup branch

palmerj commented 3 years ago

@billgeo so was it non-ASCII causing the issues from CI passing yesterday then?

billgeo commented 3 years ago

Not sure @palmerj . I think it was maybe something to do with cherry picking from master and then trying to merge the same commit back into master.

billgeo commented 3 years ago

Is should also have mentioned that I am planning to remerge this one later.

https://github.com/linz/gazetteer/pull/233