Update documentation to reflect naming

Author: amotl

CONTRIBUTING.md

@@ -1,10 +1,15 @@
-# Building WorldMap
+# Building the Grafana Map Panel
 
-The easiest way to get started is to git clone the WorldMap project directly into the `data/plugins` folder in the Grafana source. (A git repo inside of a git repo)
+The easiest way to get started is to git clone the project repository 
+directly into the `data/plugins` of your Grafana instance followed
+by building it there.
 
-1. Install npm packages: `npm install`
-2. Build and lint the JavaScript: `npm run build`
-2. Run the tests before submitting a PR: `npm run test`
-3. A test watcher when TDD:ing: `npm run test:watch`
+1. Install npm packages: `npx yarn install`
+2. Build and lint the JavaScript: `npx yarn build`
+2. Run the tests before submitting a PR: `npx yarn test`
+3. A test watcher when TDD:ing: `npx yarn dev --watch`
 
-Grafana will read in the dist folder first so to see your changes to WorldMap in Grafana, you have to run Grunt. However, you do not need to restart your local Grafana server after every change; just refresh the page.
+Grafana will read in the `dist` folder first so to see your changes in 
+Grafana, you will have to build the plugin once. However, you do not 
+need to restart your local Grafana server after every change, just 
+refreshing the page will be sufficient.

README.md

@@ -1,12 +1,12 @@
-# Worldmap Panel Plugin for Grafana
+# Grafana Map Panel
 
-The Worldmap Panel is a tile map of the world that can be overlaid with circles representing data points from a query. It can be used with time series metrics, with geohash data from Elasticsearch or data in the Table format.
+The Grafana Map Panel is a tile map of the world that can be overlaid with circles representing data points from a query. It can be used with time series metrics, with geohash data from Elasticsearch or data in the Table format.
 
-![Worldmap](https://raw.githubusercontent.com/grafana/worldmap-panel/54f83cfdc7339fee02df00933422c35630677330/src/images/worldmap-world.png)
+![Grafana Map](https://raw.githubusercontent.com/grafana/worldmap-panel/54f83cfdc7339fee02df00933422c35630677330/src/images/worldmap-world.png)
 
-## How The Worldmap Works (Theory and Examples)
+## How this works (theory and examples)
 
-The Worldmap panel needs two sources of data:
+This plugin needs two sources of data:
 
 - a location (latitude and longitude)
 - data that has a link to a location
@@ -50,7 +50,7 @@ Location data should be in the JSON format and should be an array of JSON object
 ]
 ```
 
-The Worldmap will then match the metric name (target in the example data) with a key field from the location data. With this example data there will be two circles drawn on the map, one for Sweden and one for the United States with values 183255 and 192224.
+The metric name (target in the example data) will be matched with a key field from the location data. With this example data there will be two circles drawn on the map, one for Sweden and one for the United States with values 183255 and 192224.
 
 ### Table Format
 
@@ -79,7 +79,7 @@ Table data is tabular data with columns and rows. Here is an example of Table da
 ]
 ```
 
-This query contains both data (the value `75.654324173059`) and a location (the geohash `9wvfgzurfzb` which is in Colorado). So using these, the Worldmap panel will draw one circle in Colorado, USA with the value 75.654324173059.
+This query contains both data (the value `75.654324173059`) and a location (the geohash `9wvfgzurfzb` which is in Colorado). So using these, one circle will be drawn in Colorado, USA with the value 75.654324173059.
 
 ## Time Series Data as the Data Source
 
@@ -121,7 +121,7 @@ Use the aliasByNode function to point to the field containing the country code.
 
 ![Graphite Query for Countries](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/worldmap-timeseries-query.png)
 
-Example dashboard for Worldmap with Graphite queries on [the Grafana play site](http://localhost:3000/d/000000003/worldmap-panels?panelId=8&fullscreen&edit&orgId=1).
+Example dashboard with Graphite queries on [the Grafana play site](http://localhost:3000/d/000000003/worldmap-panels?panelId=8&fullscreen&edit&orgId=1).
 
 #### InfluxDB Query
 
@@ -137,19 +137,19 @@ Use a Group By clause on the field containing the country code and a Then by cla
 
 #### Map Data Options for Time Series Data
 
-Under the Worldmap tab, choose either the `countries` or `states` option.
+On the editor tab, choose either the `countries` or `states` option.
 
-![Worldmap Options for Countries](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/countries-option.png)
+![Options for Countries](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/countries-option.png)
 
 Using a JSON endpoint to return a custom list of locations:
 
-![Worldmap Options for JSON](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/json-endpoint.png)
+![Options for JSON](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/json-endpoint.png)
 
 The endpoint used here is for the demo version of worldPing - [https://worldpingdemo.grafana.net/api/plugin-proxy/raintank-worldping-app/api/v2/probes/locations](https://worldpingdemo.grafana.net/api/plugin-proxy/raintank-worldping-app/api/v2/probes/locations). If you have your own endpoint defined it must be reachable from the client side, as it is approached by client's browser.
 
 Using a JSONP endpoint (if you need to wrap the JSON to get around CORS problems):
 
-![Worldmap Options for JSONP](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/jsonp-endpoint.png)
+![Options for JSONP](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/jsonp-endpoint.png)
 
 For some details on troubleshooting JSON/JSONP check [#47](https://github.com/grafana/worldmap-panel/issues/47).
 
@@ -159,17 +159,17 @@ Supported Databases:
 
 - ElasticSearch
 
-The [Geo-point](https://www.elastic.co/guide/en/elasticsearch/reference/2.3/geo-point.html) data type with geohash indexing in Elasticsearch can also be used as a datasource for the worldmap panel. Grafana has a new bucket aggregate for Elasticsearch queries - Geo Hash Grid that allows grouping of coordinates. The Geo Hash Grid has a precision option where 1 is the highest level and 7 is the lowest.
+The [Geo-point](https://www.elastic.co/guide/en/elasticsearch/reference/2.3/geo-point.html) data type with geohash indexing in Elasticsearch can also be used as a datasource. Grafana has a new bucket aggregate for Elasticsearch queries - Geo Hash Grid that allows grouping of coordinates. The Geo Hash Grid has a precision option where 1 is the highest level and 7 is the lowest.
 
-![Elasticsearch Query for Worldmap](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/worldmap-geohash-query.png)
+![Elasticsearch Query](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/worldmap-geohash-query.png)
 
 Three fields need to be provided by the ElasticSearch query:
 
 - A metric. This is free text and should match the aggregation used (Count, Average, Sum, Unique Count etc.)
 - Location Name (optional - geohash value will be shown if not chosen)
 - geo_point field that provides the geohash value.
 
-![Elasticsearch Query for Worldmap](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/es-options.png)
+![Elasticsearch Query](https://raw.githubusercontent.com/grafana/worldmap-panel/master/src/images/es-options.png)
 
 ## Table Data as the Data Source
 
@@ -190,7 +190,7 @@ Similar to the Elasticsearch query above, 3 fields are expected (2 of them are m
 - A *geohash* field. This is used to calculate where the circle should be drawn.
 - an optional location name field (shown in the mouse over). Used to label each circle on the map. If it is empty then the geohash value is used as the label.
 
-The field mappings have to be specified on the Worldmap settings tab.
+The field mappings have to be specified on the Grafana Map settings tab.
 
 ![Example influxdb query](https://cloud.githubusercontent.com/assets/434655/16535977/8cd520be-3fec-11e6-8dc9-2ecf7b16ad5f.png)
 
@@ -214,7 +214,7 @@ It supports any datasource capable of generating a JSON response with a custom l
 
 #### Location Data
 
-There are four ways to provide data for the worldmap panel:
+There are four ways to provide data to this plugin:
 
  - *countries*: This is a list of all the countries in the world. It works by matching a country code (US, FR, AU) to a node alias in a time series query.
  - *states*: Similar to countries but for the states in USA e.g. CA for California

src/partials/editor.html

@@ -2,10 +2,10 @@
 <span>
 
   The
-  <a href="https://github.com/panodata/grafana-worldmap-panel" class="editor-link-color" target="_blank">
-    Worldmap Panel NG
+  <a href="https://github.com/panodata/grafana-map-panel" class="editor-link-color" target="_blank">
+    Grafana Map Panel NG
   </a>
-  (<a href="https://github.com/panodata/grafana-worldmap-panel/blob/develop/CHANGELOG.md" class="editor-link-color" target="_blank">changes</a>)
+  (<a href="https://github.com/panodata/grafana-map-panel/blob/develop/CHANGELOG.md" class="editor-link-color" target="_blank">changes</a>)
   is work in progress.
 
   Enjoy
@@ -16,7 +16,7 @@
   <a href="https://community.grafana.com/t/giving-the-grafana-worldmap-panel-some-love/17210" class="editor-link-color" target="_blank">[1]</a>,
   <a href="https://github.com/grafana/worldmap-panel/issues/197" class="editor-link-color" target="_blank">[2]</a>
   and
-  <a href="https://github.com/panodata/grafana-worldmap-panel" class="editor-link-color" target="_blank">[3]</a>.
+  <a href="https://github.com/panodata/grafana-map-panel" class="editor-link-color" target="_blank">[3]</a>.
 
   Please don't use this software in production yet.