diff --git a/README.md b/README.md index 0cf50b2..2a8c320 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ have access to all the old parts from Google. ### Configuration You can configure the plugin either via the Craft CP or by duplicating the -`config.php` file to `config/simplemap.php`. +`config.php` file to `config/maps.php`. ### Eager-loading diff --git a/composer.json b/composer.json index 040ab36..83edac4 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,12 @@ { - "name": "ether/simplemap", + "name": "ether/maps", "description": "A beautifully simple Map field type for Craft CMS 3", "version": "3.5.0", "type": "craft-plugin", "license": "MIT", "minimum-stability": "dev", "require": { - "craftcms/cms": "^3.1.0", + "craftcms/cms": "^3.1.21", "mapkit/jwt": "^1.1.2", "guzzlehttp/guzzle": "^6.3.3", "ext-openssl": "*", @@ -14,22 +14,22 @@ }, "autoload": { "psr-4": { - "ether\\simplemap\\": "src/" + "ether\\maps\\": "src/" } }, "support": { "email": "help@ethercreative.co.uk", - "docs": "https://github.com/ethercreative/simplemap", + "documentationUrl": "https://github.com/ethercreative/simplemap", "source": "https://github.com/ethercreative/simplemap", "issues": "https://github.com/ethercreative/simplemap/issues" }, "extra": { - "handle": "simplemap", + "handle": "maps", "name": "Maps", - "developer": "Ether Creative", + "developer": "Ether", "developerUrl": "https://ethercreative.co.uk", - "class": "ether\\simplemap\\SimpleMap", + "class": "ether\\maps\\Maps", "schemaVersion": "3.4.1" } } diff --git a/resources/README.md b/resources/README.md index 40881be..7d7b121 100644 --- a/resources/README.md +++ b/resources/README.md @@ -1,4 +1,4 @@ -# simplemap +# Maps ## Project setup ``` diff --git a/resources/package.json b/resources/package.json index 7ad029f..62c63eb 100644 --- a/resources/package.json +++ b/resources/package.json @@ -1,5 +1,5 @@ { - "name": "simplemap", + "name": "maps", "version": "0.1.0", "private": true, "scripts": { diff --git a/resources/src/filters/craft.js b/resources/src/filters/craft.js index d7bd647..8adf804 100644 --- a/resources/src/filters/craft.js +++ b/resources/src/filters/craft.js @@ -1,4 +1,4 @@ export function t (message, params = null) { // @ts-ignore - return window.Craft.t('simplemap', message, params); + return window.Craft.t('maps', message, params); } diff --git a/resources/src/main.js b/resources/src/main.js index 1b2a7c7..964f2b4 100644 --- a/resources/src/main.js +++ b/resources/src/main.js @@ -1,12 +1,12 @@ import App from './App.vue'; import { t } from './filters/craft'; -const VueSimpleMapPlugin = { +const VueMapsPlugin = { install (Vue) { Vue.filter('t', t); - Vue.component('simple-map', App); + Vue.component('maps-map', App); } }; if (typeof window !== 'undefined' && window.Vue) - window.Vue.use(VueSimpleMapPlugin); + window.Vue.use(VueMapsPlugin); diff --git a/src/SimpleMap.php b/src/Maps.php similarity index 82% rename from src/SimpleMap.php rename to src/Maps.php index 1a41c38..b119d24 100644 --- a/src/SimpleMap.php +++ b/src/Maps.php @@ -1,35 +1,35 @@ getView()->renderTemplate( - 'simplemap/settings', + 'maps/settings', [ 'settings' => $this->getSettings(), 'mapTileOptions' => MapTiles::getSelectOptions(), @@ -141,7 +141,7 @@ public function onRegisterFeedMeFields (\craft\feedme\events\RegisterFeedMeField public static function t ($message, $params = []) { - return \Craft::t('simplemap', $message, $params); + return \Craft::t('maps', $message, $params); } } diff --git a/src/config.php b/src/config.php index 6ca81b4..7acf05b 100644 --- a/src/config.php +++ b/src/config.php @@ -1,7 +1,7 @@ MapTiles::Wikimedia, @@ -9,4 +9,4 @@ 'geoService' => GeoService::Nominatim, 'geoToken' => '', -]; \ No newline at end of file +]; diff --git a/src/elements/Map.php b/src/elements/Map.php index da033cb..7f175ff 100644 --- a/src/elements/Map.php +++ b/src/elements/Map.php @@ -1,27 +1,27 @@ parts = new Parts($this->parts); - $this->distance = SimpleMap::getInstance()->map->getDistance($this); + $this->distance = Maps::getInstance()->map->getDistance($this); } // Methods: Static @@ -85,7 +85,7 @@ public function __construct (array $config = []) public static function displayName (): string { - return SimpleMap::t('Map'); + return Maps::t('Map'); } public static function refHandle () @@ -165,7 +165,7 @@ public function rules () */ public function afterSave (bool $isNew) { - SimpleMap::getInstance()->map->saveRecord( + Maps::getInstance()->map->saveRecord( $this, $this->ownerId, $this->ownerSiteId, diff --git a/src/elements/db/MapQuery.php b/src/elements/db/MapQuery.php index 9f7ad1f..0e6fede 100644 --- a/src/elements/db/MapQuery.php +++ b/src/elements/db/MapQuery.php @@ -1,25 +1,25 @@ SimpleMap::t('Open Source') ], + [ 'optgroup' => Maps::t('Open Source') ], - self::Nominatim => SimpleMap::t('Nominatim'), + self::Nominatim => Maps::t('Nominatim'), - [ 'optgroup' => SimpleMap::t('Requires API Key (Token)') ], + [ 'optgroup' => Maps::t('Requires API Key (Token)') ], - self::Mapbox => SimpleMap::t('Mapbox'), - self::GoogleMaps => SimpleMap::t('Google Maps'), + self::Mapbox => Maps::t('Mapbox'), + self::GoogleMaps => Maps::t('Google Maps'), // MapKit lacks both separate address parts and country restriction // on the front-end, and any sort of server-side API, so it's // disabled for now. -// self::AppleMapKit => SimpleMap::t('Apple MapKit'), +// self::AppleMapKit => Maps::t('Apple MapKit'), - self::Here => SimpleMap::t('Here'), + self::Here => Maps::t('Here'), ]; } -} \ No newline at end of file +} diff --git a/src/enums/MapTiles.php b/src/enums/MapTiles.php index 9daf5d2..4dee18c 100644 --- a/src/enums/MapTiles.php +++ b/src/enums/MapTiles.php @@ -1,20 +1,20 @@ SimpleMap::t('Open Source')], + ['optgroup' => Maps::t('Open Source')], - self::Wikimedia => SimpleMap::t('Wikimedia'), + self::Wikimedia => Maps::t('Wikimedia'), - self::OpenStreetMap => SimpleMap::t('OpenStreetMap'), + self::OpenStreetMap => Maps::t('OpenStreetMap'), - self::CartoVoyager => SimpleMap::t('Carto: Voyager'), - self::CartoPositron => SimpleMap::t('Carto: Positron'), - self::CartoDarkMatter => SimpleMap::t('Carto: Dark Matter'), + self::CartoVoyager => Maps::t('Carto: Voyager'), + self::CartoPositron => Maps::t('Carto: Positron'), + self::CartoDarkMatter => Maps::t('Carto: Dark Matter'), - ['optgroup' => SimpleMap::t('Requires API Key (Token)')], + ['optgroup' => Maps::t('Requires API Key (Token)')], - self::MapboxOutdoors => SimpleMap::t('Mapbox: Outdoors'), - self::MapboxStreets => SimpleMap::t('Mapbox: Streets'), - self::MapboxLight => SimpleMap::t('Mapbox: Light'), - self::MapboxDark => SimpleMap::t('Mapbox: Dark'), + self::MapboxOutdoors => Maps::t('Mapbox: Outdoors'), + self::MapboxStreets => Maps::t('Mapbox: Streets'), + self::MapboxLight => Maps::t('Mapbox: Light'), + self::MapboxDark => Maps::t('Mapbox: Dark'), - self::GoogleRoadmap => SimpleMap::t('Google Maps: Roadmap'), - self::GoogleTerrain => SimpleMap::t('Google Maps: Terrain'), - self::GoogleHybrid => SimpleMap::t('Google Maps: Hybrid'), + self::GoogleRoadmap => Maps::t('Google Maps: Roadmap'), + self::GoogleTerrain => Maps::t('Google Maps: Terrain'), + self::GoogleHybrid => Maps::t('Google Maps: Hybrid'), - self::MapKitStandard => SimpleMap::t('Apple MapKit: Standard'), - self::MapKitMutedStandard => SimpleMap::t('Apple MapKit: Muted Standard'), - self::MapKitSatellite => SimpleMap::t('Apple MapKit: Satellite'), - self::MapKitHybrid => SimpleMap::t('Apple MapKit: Hybrid'), + self::MapKitStandard => Maps::t('Apple MapKit: Standard'), + self::MapKitMutedStandard => Maps::t('Apple MapKit: Muted Standard'), + self::MapKitSatellite => Maps::t('Apple MapKit: Satellite'), + self::MapKitHybrid => Maps::t('Apple MapKit: Hybrid'), - self::HereNormalDay => SimpleMap::t('Here: Normal Day'), - self::HereNormalDayGrey => SimpleMap::t('Here: Normal Day Grey'), - self::HereNormalDayTransit => SimpleMap::t('Here: Normal Day Transit'), - self::HereReduced => SimpleMap::t('Here: Reduced'), - self::HerePedestrian => SimpleMap::t('Here: Pedestrian'), - self::HereTerrain => SimpleMap::t('Here: Terrain'), - self::HereSatellite => SimpleMap::t('Here: Satellite'), - self::HereHybrid => SimpleMap::t('Here: Hybrid'), + self::HereNormalDay => Maps::t('Here: Normal Day'), + self::HereNormalDayGrey => Maps::t('Here: Normal Day Grey'), + self::HereNormalDayTransit => Maps::t('Here: Normal Day Transit'), + self::HereReduced => Maps::t('Here: Reduced'), + self::HerePedestrian => Maps::t('Here: Pedestrian'), + self::HereTerrain => Maps::t('Here: Terrain'), + self::HereSatellite => Maps::t('Here: Satellite'), + self::HereHybrid => Maps::t('Here: Hybrid'), ]; } -} \ No newline at end of file +} diff --git a/src/fields/Map.php b/src/fields/Map.php index 584fbfe..230eb93 100644 --- a/src/fields/Map.php +++ b/src/fields/Map.php @@ -6,13 +6,13 @@ * @copyright Copyright (c) 2019 Ether Creative */ -namespace ether\simplemap\fields; +namespace ether\maps\fields; /** * Class Map * * @author Ether Creative - * @package ether\simplemap\fields + * @package ether\maps\fields */ class Map extends MapField -{} \ No newline at end of file +{} diff --git a/src/integrations/craftql/GetCraftQLSchema.php b/src/integrations/craftql/GetCraftQLSchema.php index fc5885f..d3042fd 100644 --- a/src/integrations/craftql/GetCraftQLSchema.php +++ b/src/integrations/craftql/GetCraftQLSchema.php @@ -6,7 +6,7 @@ * @copyright Copyright (c) 2019 Ether Creative */ -namespace ether\simplemap\integrations\craftql; +namespace ether\maps\integrations\craftql; use markhuot\CraftQL\Events\GetFieldSchema; @@ -14,11 +14,14 @@ * Class GetCraftQLSchema * * @author Ether Creative - * @package ether\simplemap\integrations\craftql + * @package ether\maps\integrations\craftql */ class GetCraftQLSchema { + /** + * @param GetFieldSchema $event + */ public function handle (GetFieldSchema $event) { $event->handled = true; @@ -52,6 +55,7 @@ public function handle (GetFieldSchema $event) $query->addStringArgument('location'); $query->addStringArgument('country'); $query->addFloatArgument('radius'); + /** @noinspection PhpUndefinedMethodInspection */ $query->addEnumArgument('unit')->values([ 'mi' => 'Miles', 'km' => 'Kilometres', @@ -82,4 +86,4 @@ public function handle (GetFieldSchema $event) $event->mutation->addArgument($event->sender)->type($mutation); } -} \ No newline at end of file +} diff --git a/src/integrations/feedme/FeedMeMaps.php b/src/integrations/feedme/FeedMeMaps.php index e4acc61..eef030e 100644 --- a/src/integrations/feedme/FeedMeMaps.php +++ b/src/integrations/feedme/FeedMeMaps.php @@ -6,21 +6,21 @@ * @copyright Copyright (c) 2019 Ether Creative */ -namespace ether\simplemap\integrations\feedme; +namespace ether\maps\integrations\feedme; use Cake\Utility\Hash; use craft\feedme\base\Field; use craft\feedme\base\FieldInterface; use craft\feedme\helpers\DataHelper; -use ether\simplemap\elements\Map; -use ether\simplemap\fields\MapField; -use ether\simplemap\models\Parts; +use ether\maps\elements\Map; +use ether\maps\fields\MapField; +use ether\maps\models\Parts; /** * Class FeedMeMaps * * @author Ether Creative - * @package ether\simplemap\integrations\feedme + * @package ether\maps\integrations\feedme */ class FeedMeMaps extends Field implements FieldInterface { @@ -39,7 +39,7 @@ class FeedMeMaps extends Field implements FieldInterface public function getMappingTemplate () { - return 'simplemap/_feedme-mapping'; + return 'maps/_feedme-mapping'; } public function parseField () diff --git a/src/migrations/Install.php b/src/migrations/Install.php index fc5d4c7..8ff6662 100644 --- a/src/migrations/Install.php +++ b/src/migrations/Install.php @@ -1,22 +1,22 @@ dropTableIfExists(Map::TableName); } -} \ No newline at end of file +} diff --git a/src/migrations/m190325_130533_repair_map_elements.php b/src/migrations/m190325_130533_repair_map_elements.php index 40b34c3..247c2dc 100644 --- a/src/migrations/m190325_130533_repair_map_elements.php +++ b/src/migrations/m190325_130533_repair_map_elements.php @@ -1,12 +1,12 @@ hasOne(Field::class, ['id' => 'fieldId']); } -} \ No newline at end of file +} diff --git a/src/services/GeoService.php b/src/services/GeoService.php index a189c73..2a79003 100644 --- a/src/services/GeoService.php +++ b/src/services/GeoService.php @@ -6,16 +6,16 @@ * @copyright Copyright (c) 2019 Ether Creative */ -namespace ether\simplemap\services; +namespace ether\maps\services; use craft\base\Component; use craft\helpers\Json; -use ether\simplemap\enums\GeoService as GeoEnum; -use ether\simplemap\enums\MapTiles; -use ether\simplemap\models\Parts; -use ether\simplemap\models\PartsLegacy; -use ether\simplemap\models\Settings; -use ether\simplemap\SimpleMap; +use ether\maps\enums\GeoService as GeoEnum; +use ether\maps\enums\MapTiles; +use ether\maps\models\Parts; +use ether\maps\models\PartsLegacy; +use ether\maps\models\Settings; +use ether\maps\Maps; use GuzzleHttp\Client; use Mapkit\JWT; use yii\db\Exception; @@ -24,7 +24,7 @@ * Class GeoService * * @author Ether Creative - * @package ether\simplemap\services + * @package ether\maps\services */ class GeoService extends Component { @@ -579,7 +579,7 @@ public static function getToken ($token, string $service) public static function latLngFromAddress ($address, $country = null) { /** @var Settings $settings */ - $settings = SimpleMap::getInstance()->getSettings(); + $settings = Maps::getInstance()->getSettings(); $token = static::getToken($settings->geoToken, $settings->geoService); switch ($settings->geoService) @@ -622,7 +622,7 @@ public static function latLngFromAddress ($address, $country = null) public static function addressFromLatLng ($lat, $lng) { /** @var Settings $settings */ - $settings = SimpleMap::getInstance()->getSettings(); + $settings = Maps::getInstance()->getSettings(); $token = static::getToken($settings->geoToken, $settings->geoService); @@ -878,4 +878,4 @@ private static function _validateCountryCode (string $code) return in_array(strtoupper($code), array_keys(static::$countries)); } -} \ No newline at end of file +} diff --git a/src/services/MapService.php b/src/services/MapService.php index deddc5a..cab8f9c 100644 --- a/src/services/MapService.php +++ b/src/services/MapService.php @@ -6,23 +6,23 @@ * @copyright Copyright (c) 2019 Ether Creative */ -namespace ether\simplemap\services; +namespace ether\maps\services; use craft\base\Component; use craft\base\Element; use craft\base\ElementInterface; use craft\elements\db\ElementQuery; use craft\elements\db\ElementQueryInterface; -use ether\simplemap\elements\Map; -use ether\simplemap\elements\Map as MapElement; -use ether\simplemap\fields\MapField; -use ether\simplemap\records\Map as MapRecord; +use ether\maps\elements\Map; +use ether\maps\elements\Map as MapElement; +use ether\maps\fields\MapField; +use ether\maps\records\Map as MapRecord; /** * Class MapService * * @author Ether Creative - * @package ether\simplemap\services + * @package ether\maps\services */ class MapService extends Component { diff --git a/src/templates/_feedme-mapping.twig b/src/templates/_feedme-mapping.twig index 53d178e..af21d38 100644 --- a/src/templates/_feedme-mapping.twig +++ b/src/templates/_feedme-mapping.twig @@ -36,14 +36,14 @@ -{% set simpleMapSubfields = { - lat: 'Latitude'|t('simplemap'), - lng: 'Longitude'|t('simplemap'), - zoom: 'Zoom'|t('simplemap'), - address: 'Address'|t('simplemap'), +{% set mapsSubfields = { + lat: 'Latitude'|t('maps'), + lng: 'Longitude'|t('maps'), + zoom: 'Zoom'|t('maps'), + address: 'Address'|t('maps'), } %} -{% for key, col in simpleMapSubfields %} +{% for key, col in mapsSubfields %} {% set nameLabel = col %} {% set instructionsHandle = handle ~ '[' ~ key ~ ']' %} diff --git a/src/templates/field-settings.twig b/src/templates/field-settings.twig index 8530bbc..ad3c759 100644 --- a/src/templates/field-settings.twig +++ b/src/templates/field-settings.twig @@ -1,45 +1,45 @@ {% import '_includes/forms' as forms %} {{ forms.field({ - label: 'Initial Location'|t('simplemap'), - instructions: 'The initial location and zoom that will show in the map field'|t('simplemap'), + label: 'Initial Location'|t('maps'), + instructions: 'The initial location and zoom that will show in the map field'|t('maps'), }, map) }} {{ forms.lightswitchField({ - label: 'Hide Search'|t('simplemap'), - instructions: 'Hide the location search field'|t('simplemap'), + label: 'Hide Search'|t('maps'), + instructions: 'Hide the location search field'|t('maps'), id: 'hideSearch', name: 'hideSearch', on: field.hideSearch }) }} {{ forms.lightswitchField({ - label: 'Hide Map'|t('simplemap'), - instructions: 'Hide the map'|t('simplemap'), + label: 'Hide Map'|t('maps'), + instructions: 'Hide the map'|t('maps'), id: 'hideMap', name: 'hideMap', on: field.hideMap }) }} {{ forms.lightswitchField({ - label: 'Hide Address'|t('simplemap'), - instructions: 'Hide the address fields'|t('simplemap'), + label: 'Hide Address'|t('maps'), + instructions: 'Hide the address fields'|t('maps'), id: 'hideAddress', name: 'hideAddress', on: field.hideAddress }) }} {{ forms.lightswitchField({ - label: 'Show Latitude / Longitude'|t('simplemap'), - instructions: 'Show the latitude / longitude fields'|t('simplemap'), + label: 'Show Latitude / Longitude'|t('maps'), + instructions: 'Show the latitude / longitude fields'|t('maps'), id: 'showLatLng', name: 'showLatLng', on: field.showLatLng }) }} {{ forms.selectField({ - label: 'Preferred Country'|t('simplemap'), - instructions: 'When searching for a location, results in this country will take precedence'|t('simplemap'), + label: 'Preferred Country'|t('maps'), + instructions: 'When searching for a location, results in this country will take precedence'|t('maps'), id: 'country', name: 'country', options: countries, diff --git a/src/templates/settings.twig b/src/templates/settings.twig index 6fdc560..2a57fbb 100644 --- a/src/templates/settings.twig +++ b/src/templates/settings.twig @@ -7,14 +7,14 @@ {%- endmacro %} {% import _self as _ %} -
-