Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass the protomaps API key through process-one #68

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Pass the protomaps API key through process-one #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions openaddr/process_one.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def boolstr(value):

def process(source, destination, layer, layersource,
do_preview, do_pmtiles,
mapbox_key=None, extras=dict()):
protomaps_key=None, extras=dict()):
''' Process a single source and destination, return path to JSON state file.

Creates a new directory and files under destination.
Expand Down Expand Up @@ -155,8 +155,8 @@ def process(source, destination, layer, layersource,
else:
_L.info('Processed data in {}'.format(conform_result.path))

if do_preview and mapbox_key:
preview_path = render_preview(conform_result.path, temp_dir, mapbox_key)
if do_preview and protomaps_key:
preview_path = render_preview(conform_result.path, temp_dir, protomaps_key)

if not preview_path:
_L.warning('Nothing previewed')
Expand Down Expand Up @@ -209,11 +209,11 @@ def upgrade_source_schema(schema):

return v2

def render_preview(csv_filename, temp_dir, mapbox_key):
def render_preview(csv_filename, temp_dir, protomaps_key):
'''
'''
png_filename = join(temp_dir, 'preview.png')
preview.render(csv_filename, png_filename, 668, 2, mapbox_key)
preview.render(csv_filename, png_filename, 668, 2, protomaps_key)

return png_filename

Expand Down Expand Up @@ -415,8 +415,8 @@ def write_state(source, layer, data_source_name, skipped, destination, log_handl
action='store_const', dest='render_preview',
const=True, default=True)

parser.add_argument('--mapbox-key', dest='mapbox_key',
help='Mapbox API Key. See: https://mapbox.com/')
parser.add_argument('--protomaps-key', dest='protomaps_key',
help='Protomaps API Key. See: https://protomaps.com/dashboard')

parser.add_argument('-l', '--logfile', help='Optional log file name.')

Expand Down Expand Up @@ -451,9 +451,9 @@ def main():

args = parser.parse_args()

# Can't generate preview without Mapbox key
if args.render_preview and not args.mapbox_key:
_L.error('Mapbox key is required to generate preview')
# Can't generate preview without Protomaps key
if args.render_preview and not args.protomaps_key:
_L.error('Protomaps key is required to generate preview')
return 1

# Allow CSV files with very long fields
Expand All @@ -464,7 +464,7 @@ def main():
args.layer, args.layersource,
args.render_preview,
args.render_preview,
mapbox_key=args.mapbox_key)
protomaps_key=args.protomaps_key)
except Exception as e:
_L.error(e, exc_info=True)
return 1
Expand Down
10 changes: 5 additions & 5 deletions openaddr/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ def test_single_ac_local(self):
mock.patch('openaddr.slippymap.generate') as slippymap_gen:
preview_ren.side_effect = touch_second_arg_file
slippymap_gen.side_effect = touch_first_arg_file
state_path = process_one.process(source, self.testdir, "addresses", "default", True, True, mapbox_key='mapbox-XXXX')
state_path = process_one.process(source, self.testdir, "addresses", "default", True, True, protomaps_key='protomaps-XXXX')

self.assertTrue(list(slippymap_gen.mock_calls[0])[1][0].endswith('.pmtiles'))
self.assertTrue(list(slippymap_gen.mock_calls[0])[1][1].endswith('.geojson'))
Expand Down Expand Up @@ -392,7 +392,7 @@ def test_single_ac(self):
mock.patch('openaddr.slippymap.generate') as slippymap_gen:
preview_ren.side_effect = touch_second_arg_file
slippymap_gen.side_effect = touch_first_arg_file
state_path = process_one.process(source, self.testdir, "addresses", "default", True, True, mapbox_key='mapbox-XXXX')
state_path = process_one.process(source, self.testdir, "addresses", "default", True, True, protomaps_key='protomaps-XXXX')

self.assertTrue(list(slippymap_gen.mock_calls[0])[1][0].endswith('.pmtiles'))
self.assertTrue(list(slippymap_gen.mock_calls[0])[1][1].endswith('.geojson'))
Expand Down Expand Up @@ -435,7 +435,7 @@ def test_single_ac_mixedcase(self):
mock.patch('openaddr.slippymap.generate') as slippymap_gen:
preview_ren.side_effect = touch_second_arg_file
slippymap_gen.side_effect = touch_first_arg_file
state_path = process_one.process(source, self.testdir, "addresses", "default", True, True, mapbox_key='mapbox-XXXX')
state_path = process_one.process(source, self.testdir, "addresses", "default", True, True, protomaps_key='protomaps-XXXX')

self.assertTrue(list(slippymap_gen.mock_calls[0])[1][0].endswith('.pmtiles'))
self.assertTrue(list(slippymap_gen.mock_calls[0])[1][1].endswith('.geojson'))
Expand Down Expand Up @@ -475,7 +475,7 @@ def test_single_sf(self):
mock.patch('openaddr.slippymap.generate') as slippymap_gen:
preview_ren.side_effect = touch_second_arg_file
slippymap_gen.side_effect = touch_first_arg_file
state_path = process_one.process(source, self.testdir, "addresses", "default", True, True, mapbox_key='mapbox-XXXX')
state_path = process_one.process(source, self.testdir, "addresses", "default", True, True, protomaps_key='protomaps-XXXX')

self.assertTrue(list(slippymap_gen.mock_calls[0])[1][0].endswith('.pmtiles'))
self.assertTrue(list(slippymap_gen.mock_calls[0])[1][1].endswith('.geojson'))
Expand Down Expand Up @@ -519,7 +519,7 @@ def test_single_car(self):
mock.patch('openaddr.slippymap.generate') as slippymap_gen:
preview_ren.side_effect = touch_second_arg_file
slippymap_gen.side_effect = touch_first_arg_file
state_path = process_one.process(source, self.testdir, "addresses", "default", True, True, mapbox_key='mapbox-XXXX')
state_path = process_one.process(source, self.testdir, "addresses", "default", True, True, protomaps_key='protomaps-XXXX')

self.assertTrue(list(slippymap_gen.mock_calls[0])[1][0].endswith('.pmtiles'))
self.assertTrue(list(slippymap_gen.mock_calls[0])[1][1].endswith('.geojson'))
Expand Down
Loading