merge issues fixed

AZMAG · Jul 28, 2020 · 15f0e47 · 15f0e47
2 parents 08b6178 + 03c6f2b
commit 15f0e47
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ The Maricopa Association of Governments (MAG) mapping page showing businesses op
 
 ## Version
 
-### version | 1.2.2 ###
+### version | 1.2.4 ###
 
 * #### Updated | 2020-07-28 ####
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "Peoria-Business-Resources-Tool",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "date": "2020-07-28",
     "copyright": "2020",
     "description": "MAG webmap for City of Peoria Businesses",

diff --git a/src/humans.txt b/src/humans.txt
@@ -47,7 +47,7 @@
 # SITE
     Site Name: Peoria-Business-Resources-Tool
     Site URL: http://geo.azmag.gov/maps/peoriabiz/
-    Version: 1.2.2
+    Version: 1.2.4
 	Last updated: 2020-07-28
     Creation date: 2020-04-09
 	Language: English

diff --git a/src/index.html b/src/index.html
@@ -17,8 +17,8 @@
     <meta name="url" content="https://geo.azmag.gov/maps/peoriabiz/">
     <meta name="creation-date" content="2020-04-09">
     <meta name="revision-date" content="2020-07-28">
-    <meta name="build-info" content="1.2.2.202007281051">
-    <meta name="version" content="1.2.2">
+    <meta name="build-info" content="1.2.4.202007281551">
+    <meta name="version" content="1.2.4">
     <!-- Application CSS -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" />
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.6.3/css/all.min.css" />

diff --git a/src/js/config.js b/src/js/config.js
@@ -40,7 +40,7 @@ define([], function () {
     };
 
     return {
-        version: "v1.2.2 | 2020-07-28",
+        version: "v1.2.4 | 2020-07-28",
         copyright: "2020",
 
         peoriaURL: "https://www.peoriaaz.gov/",

diff --git a/src/views/modal-legal.html b/src/views/modal-legal.html
@@ -9,41 +9,41 @@ <h5 class="modal-title">Legal Disclaimer</h5>
         <div class="modal-body">
 
             <div class="legal panel-body">
-                <p>The Maricopa Association of Governments (MAG) provides the data within these pages as a
+                <p>The Maricopa Association of Governments (MAG) and City of Peoria provides the data within these pages as a
                     public resource of general information for use "as is". The Maricopa Association of
                     Governments GIS (Geographic Information System) departments provides this information
                     with the understanding that it is not guaranteed to be accurate, correct or complete and
                     any conclusions drawn from such information are the sole responsibility of the user.
-                    Further, the Maricopa Association of Governments GIS departments makes no warranty,
+                    Further, the Maricopa Association of Governments and City of Peoria GIS departments makes no warranty,
                     representation or guaranty as to the content, sequence, accuracy, timeliness or
                     completeness of any of the spatial or database information provided herein. While every
                     effort has been made to ensure the content, sequence, accuracy, timeliness or
                     completeness of materials presented within these pages, the Maricopa Association of
                     Governments GIS Departments assumes no responsibility for errors or omissions, and
                     explicitly disclaims any representations and warranties, including, without limitation,
                     the implied warranties of merchantability and fitness for a particular purpose. The
-                    Maricopa Association of Governments GIS Departments shall assume no liability for:</p>
+                    Maricopa Association of Governments and City of Peoria GIS Departments shall assume no liability for:</p>
                 <ol>
                     <li>Any errors, omissions, or inaccuracies in the information provided, regardless of
                         how caused; or</li>
                     <li>Any decision made or action taken or not taken by viewer in reliance upon any
                         information or data furnished hereunder.</li>
                 </ol>
-                <p>Availability of the Maricopa Association of Governments Map Server is not guaranteed.
+                <p>Availability of the Maricopa Association of Governments and City of Peoria Map Server is not guaranteed.
                     Applications, servers, and network connections may be unavailable at any time for
                     maintenance or unscheduled outages. Outages may be of long duration. Users are cautioned
                     to create dependencies on these services for critical needs.</p>
                 <p>THE FOREGOING WARRANTY IS EXCLUSIVE AND IN LIEU OF ALL OTHER WARRANTIES OF
                     MERCHANTABILITY, FITNESS FOR PARTICULAR PURPOSE AND/OR ANY OTHER TYPE WHETHER EXPRESSED
-                    OR IMPLIED. In no event shall The Maricopa Association of Governments become liable to
+                    OR IMPLIED. In no event shall The Maricopa Association of Governments and City of Peoria become liable to
                     users of these data, or any other party, for any loss or direct, indirect, special,
                     incidental or consequential damages, including, but not limited to, time, money or
                     goodwill, arising from the use or modification of the data.</p>
-                <p>To assist the Maricopa Association of Governments in the maintenance and/or correction of
-                    the data, users should provide the Maricopa Association of Governments GIS Departments
+                <p>To assist the Maricopa Association of Governments and the City of Peoria in the maintenance and/or correction of
+                    the data, users should provide the Maricopa Association of Governments and City of Peoria GIS Departments
                     with information concerning errors or discrepancies found in using the data. Please use
                     the e-mail contact address at the bottom of the affected web page.</p>
-                <p>Please acknowledge the Maricopa Association of Governments GIS as the source when Map
+                <p>Please acknowledge the Maricopa Association of Governments and City of Peoria GIS as the source when Map
                     Server data is used in the preparation of reports, papers, publications, maps, or other
                     products.</p>
                 <p>To provide comments or report problems please contact: