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.

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

dev/core#43 - Update geocoding setting text to reflect need for Google API key #12188

Merged
merged 4 commits into from
May 24, 2018

Conversation

larssandergreen
Copy link
Contributor

Overview

The explanatory text on the geocoding settings page indicates that Google doesn't need an API key, but geocoding will no longer work without an API key. Also, the text says you do not need to enter a Geocoding provider if you are using Google as your mapping provider, but this is no longer true.

Before

image
Also the same in the Map Provider Key and Mapping Provider descriptions in the API.

After

To come.

@civicrm-builder
Copy link

Can one of the admins verify this patch?

@seamuslee001
Copy link
Contributor

Jenkins test this please

@eileenmcnaughton
Copy link
Contributor

@larssg-wildsight this makes sense

I think the big picture is we really want geocoding to be an extension service, not a core service - ie. ideally this would replace having a geocoder in core at all

https://github.com/eileenmcnaughton/org.wikimedia.geocoder

But, I think this should be merged as it DOES improve the help text accuracy

@eileenmcnaughton eileenmcnaughton merged commit 97fcfaf into civicrm:master May 24, 2018
@eileenmcnaughton
Copy link
Contributor

I just noticed this doesn't really make sense

"You may choose a different webservice for geocoding or select the same service."

@@ -2313,7 +2313,7 @@ function setting_getfields_expectedresult() {
),
'default' => '',
'title' => 'Geocoding Provider',
'description' => 'You may choose a different webservice for geocoding. This is required if there is no geo-coding plugin for your selected mapping provider. You can leave the Geocoding fields blank if you are using Google as your mapping provider.',
'description' => 'You may choose a different webservice for geocoding or select the same service.',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe change to 'or select the same service as you use for Map Provider.'

@@ -72,7 +72,7 @@
),
'default' => NULL,
'title' => 'Geocoding Provider',
'description' => 'You may choose a different webservice for geocoding. This is required if there is no geo-coding plugin for your selected mapping provider. You can leave the Geocoding fields blank if you are using Google as your mapping provider.',
'description' => 'You may choose a different webservice for geocoding or select the same service.',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe change to 'or select the same service as you use for Map Provider.'

</tr>
<tr class="crm-map-form-block-geoProvider">
<td>{$form.geoProvider.label}</td>
<td>{$form.geoProvider.html}<br />
<span class="description">{ts}You may choose a different webservice for geocoding. This is required if there is no geo-coding plugin for your selected mapping provider. You can leave the Geocoding fields blank if you are using Google as your mapping provider.{/ts}</span></td>
<span class="description">{ts}You may choose a different webservice for geocoding or select the same service.{/ts}</span></td>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe change to 'or select the same service as you use for Map Provider.'

@larssandergreen
Copy link
Contributor Author

Good point!

I've updated to this:

This can be the same or different from the mapping provider selected.

which I hope is clear.

Here: #12232

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants