Merge pull request #30 from OpenGeoscience/descriptions

Data descriptions, file headers and ansible fixes

Author: aashish24

ansible/Vagrantfile

@@ -12,7 +12,7 @@ Vagrant.configure("2") do |config|
     # Ref: https://github.com/Kitware/minerva/pull/98#issuecomment-139023062
     config.vm.network "private_network", ip: "192.168.33.12"
     geoservices.vm.provider :virtualbox do |vb|
-       vb.customize [ "modifyvm", :id, "--name", "geoservices","--memory", 4096 ]
+       vb.customize [ "modifyvm", :id, "--name", "geoservices","--memory", 6144 ]
         end
     geoservices.vm.provision "ansible" do |ansible|
       ansible.playbook = "playbook.yml"

ansible/roles/dataqs/tasks/main.yml

@@ -93,7 +93,7 @@
   ignore_errors: yes
 
 - name: create geoserver data directory
-  file: path=/var/lib/tomcat7/webapps/geoserver/data/data/geonode/forecast_io_airtemp recurse=yes owner=tomcat7 group=tomcat7 state=directory mode=g+rws
+  file: path=/var/lib/tomcat7/webapps/geoserver/data/data/geonode/forecast_io_airtemp recurse=yes owner=tomcat7 group=tomcat7 state=directory mode=774
   sudo: yes
 
 - include: geoserver_permissions.yml

ansible/roles/dataqs/templates/dataq_settings.py

@@ -135,37 +135,43 @@
         'name': 'US State Boundaries',
         'url': 'https://hifld-dhs-gii.opendata.arcgis.com/datasets/718791120f6549708cb642dac6ff0dbf_0.geojson',
         'table': 'us_state_boundaries',
-        'sld': 'polygon'
+        'sld': 'polygon',
+        'description': 'This dataset represents States and equivalent entities, which are the primary governmental divisions of the United States. The TIGER/Line shapefiles and related database files (.dbf) are an extract of selected geographic and cartographic information from the U.S. Census Bureau\'s Master Address File / Topologically Integrated Geographic Encoding and Referencing (MAF/TIGER) Database (MTDB). The MTDB represents a seamless national file with no overlaps or gaps between parts, however, each TIGER/Line shapefile is designed to stand alone as an independent data set, or they can be combined to cover the entire nation. In addition to the fifty States, the Census Bureau treats the District of Columbia, Puerto Rico, and each of the Island Areas (American Samoa, the Commonwealth of the Northern Mariana Islands, Guam, and the U.S. Virgin Islands) as the statistical equivalents of States for the purpose of data presentation.  \n\nSource: Homeland Infrastructure Foundation-Level Data (HIFLD) @ https://hifld-dhs-gii.opendata.arcgis.com/datasets/718791120f6549708cb642dac6ff0dbf_0'
     },
     {
         'name': 'US County Boundaries',
         'url': 'https://hifld-dhs-gii.opendata.arcgis.com/datasets/53270fe7036f428fbfb11c4511994a6f_0.geojson',
         'table': 'us_county_boundaries',
-        'sld': 'polygon'
+        'sld': 'polygon',
+        'description': 'This dataset represents a seamless national county file with no overlaps or gaps between parts, however, each TIGER/Line shapefile is designed to stand alone as an independent data set, or they can be combined to cover the entire nation. The primary legal divisions of most states are termed counties. In Louisiana, these divisions are known as parishes. In Alaska, which has no counties, the equivalent entities are the organized boroughs, city and boroughs, municipalities, and for the unorganized area, census areas. The latter are delineated cooperatively for statistical purposes by the State of Alaska and the Census Bureau. In four states (Maryland, Missouri, Nevada, and Virginia), there are one or more incorporated places that are independent of any county organization and thus constitute primary divisions of their states. These incorporated places are known as independent cities and are treated as equivalent entities for purposes of data presentation. The District of Columbia and Guam have no primary divisions, and each area is considered an equivalent entity for purposes of data presentation. The Census Bureau treats the following entities as equivalents of counties for purposes of data presentation: Municipios in Puerto Rico, Districts and Islands in American Samoa, Municipalities in the Commonwealth of the Northern Mariana Islands, and Islands in the U.S. Virgin Islands. The entire area of the United States, Puerto Rico, and the Island Areas is covered by counties or equivalent entities. The boundaries for counties and equivalent entities are mostly as of January 1, 2013, primarily as reported through the Census Bureau\'s Boundary and Annexation Survey (BAS). However, some changes made after January 2013, including the addition and deletion of counties, are included. \n\nSource: Homeland Infrastructure Foundation-Level Data (HIFLD) @ https://hifld-dhs-gii.opendata.arcgis.com/datasets/53270fe7036f428fbfb11c4511994a6f_0'
     },
     {
         'name': 'US Urban Areas',
         'url': 'https://hifld-dhs-gii.opendata.arcgis.com/datasets/12076211b9f047aca1153cb079bbd923_0.geojson',
         'table': 'us_urban_areas',
-        'sld': 'polygon'
+        'sld': 'polygon',
+        'description': 'This dataset represents urban areas that represent densely developed territory, encompassing residential, commercial, and other nonresidential urban land uses. In general, this territory consists of areas of high population density and urban land use resulting in a representation of the "urban footprint." There are two types of urban areas: urbanized areas (UAs) that contain 50,000 or more people and urban clusters (UCs) that contain at least 2,500 people, but fewer than 50,000 people (except in the U.S. Virgin Islands and Guam which each contain urban clusters with populations greater than 50,000). Each urban area is identified by a 5-character numeric census code that may contain leading zeroes.  \n\nSource: Homeland Infrastructure Foundation-Level Data (HIFLD) @ https://hifld-dhs-gii.opendata.arcgis.com/datasets/12076211b9f047aca1153cb079bbd923_0'
     },
     {
         'name': 'Poultry Slaughtering and Processing Facilities ',
         'url': 'https://hifld-dhs-gii.opendata.arcgis.com/datasets/b6b9cc72fb58476d92056d5c7ed25f8b_0.geojson',
         'table': 'poultry_facilities',
-        'sld': 'point'
+        'sld': 'point',
+        'description': 'This dataset represents facilities which engage in slaughtering, processing, and/or warehousing for the purpose of producing poultry and egg products. Facilities where poultry is raised or where eggs are laid are not included in this dataset, as they are included in a separate layer. \n\nThe source data used for this data layer does not include any facilities in American Samoa, the US Virgin Islands, or Wyoming. Records with "-DOD" appended to the end of the [NAME] value are located on a military base, as defined by the Defense Installation Spatial Data Infrastructure (DISDI) military installations and military range boundaries. \n\nAt the request of NGA, text fields in this dataset have been set to all upper case to facilitate consistent database engine search results. At the request of NGA, all diacritics (e.g., the German umlaut or the Spanish tilde) have been replaced with their closest equivalent English character to facilitate use with database systems that may not support diacritics. The currentness of this dataset is indicated by the [CONTDATE] field. Based upon this field, the oldest record dates from 01/22/09 and the newest record dates from 07/10/09. \n\nThe following use cases describe how the data may be used and help to define and clarify requirements.\n\n1) A threat against agricultural facilities has been identified and protective measures must be taken to protect the food supply.\n2) A disaster has occurred, or is in the process of occurring, and facilities in the vicinity must be identified in order to comprehensively evacuate and secure the area.\n\nTGS was not tasked with ensuring the completeness of this layer.\n\nSource: Homeland Infrastructure Foundation-Level Data (HIFLD) @ https://hifld-dhs-gii.opendata.arcgis.com/datasets/b6b9cc72fb58476d92056d5c7ed25f8b_0'
     },
     {
         'name': 'State Fairgrounds',
         'url': 'https://hifld-dhs-gii.opendata.arcgis.com/datasets/7f35881c8860490ab6a76516978e9e15_0.geojson',
         'table': 'state_fairgrounds',
-        'sld': 'point'
+        'sld': 'point',
+        'description': 'This dataset represents the locations of the major state/regional agricultural fairs held throughout the United States. This dataset displays the locations and other pertinent information about the state level agricultural fairs held throughout the United States. It aids in providing the situational awareness for the agricultural sector, as well as the high value symbolic sector. Not only are the fairs gathering places for large numbers of livestock that then disperse, but large numbers of people congregate at these fairs. Additionally, other events--such as gun shows, arts & crafts shows, trade shows, etc.--are held at the fairgrounds locations through the year.\n\nSome states (e.g., Alaska) have multiple state fairground sites. Hawaii holds its main state fair event at the Aloha Bowl, but does not have any other specific state fairground facility. Rhode Island and Connecticut do not hold specific state fair events--just regional events. In summary, 47 states have at least 1 record within this database, while Hawaii, Connecticut, and Rhode Island are not represented. There are no state fair events represented in any of the major U.S. territories (e.g., Puerto Rico).\n\nSource: Homeland Infrastructure Foundation-Level Data (HIFLD) @ https://hifld-dhs-gii.opendata.arcgis.com/datasets/7f35881c8860490ab6a76516978e9e15_0'
     },
     {
         'name': 'EPA Emergency Response (ER) Toxic Substances Control Act (TSCA) Facilities',
         'url': 'https://hifld-dhs-gii.opendata.arcgis.com/datasets/5e2d8818b8ca4dbc8f14ea2e118b9a86_0.geojson',
         'table': 'epa_tsca_facilities',
-        'sld': 'point'
+        'sld': 'point',
+        'description': 'This dataset represents integrated facility information from FRS, limited to the subset of facilities that link to the Toxic Substances Control Act (TSCA). This subset of data was identified as information that can be used in the Hazardous Materials Emergency Support Function #10. Additional contact, state ids, NAICs, and SIC attributes are linked by registry id. It contains only active facilities. This feature contains location and facility identification information from EPA\'s Facility Registry System (FRS) for the subset of facilities that link to the Toxic Substances Control Act (TSCA) System. The TSCA database supports the Toxic Substances Control Act (TSCA) of 1976, which provides EPA with authority to require reporting, record-keeping and testing requirements, and restrictions relating to chemical substances and/or mixtures. Certain substances are generally excluded from TSCA, including, among others, food, drugs, cosmetics and pesticides. TSCA addresses the production, importation, use, and disposal of specific chemicals including polychlorinated biphenyls (PCBs), asbestos, radon and lead-based paint.FRS identifies and geospatially locates facilities, sites or places subject to environmental regulations or of environmental interest. Using vigorous verification and data management procedures, FRS integrates facility data from EPA\'s national program systems, other federal agencies, and State and tribal master facility records and provides EPA with a centrally managed, single source of comprehensive and authoritative information on facilities. This data set contains the subset of FRS integrated facilities that link to TSCA facilities once the TSCA data has been integrated into the FRS database. Additional information on FRS is available at the EPA website http://www.epa.gov/enviro/html/fii/index.html.\n\nSource: Homeland Infrastructure Foundation-Level Data (HIFLD) @ https://hifld-dhs-gii.opendata.arcgis.com/datasets/5e2d8818b8ca4dbc8f14ea2e118b9a86_0'
     }
 ]
 

ansible/roles/geonode/tasks/main.yml

@@ -99,8 +99,6 @@
                  lc_ctype='en_US.UTF-8'
                  owner={{db_user}}
                  template='template0'
-  sudo: yes
-  sudo_user: postgres
   retries: 2
   delay: 5
 
@@ -112,14 +110,14 @@
                  owner={{db_user}}
                  template='template0'
   sudo: yes
-  sudo_user: postgres
+  sudo_user: root
   retries: 2
   delay: 5
 
 - name: add postgis to the {{db_data_instance}} db
   postgresql_ext: name=postgis db={{db_data_instance}}
   sudo: yes
-  sudo_user: postgres
+  sudo_user: root
 
 - name: make manage executable for ansible >= 2.0
   file: path={{app_code_dir}}/{{app_name}}/manage.py mode=0770

ansible/roles/geoserver/tasks/main.yml

@@ -16,7 +16,10 @@
 - name: copy the Tomcat setenv.sh file to /usr/share/tomcat7/bin
   template: src=setenv.sh dest=/usr/share/tomcat7/bin/setenv.sh
   sudo: yes
-  notify: restart tomcat
+
+- name: copy the tomcat7 file to /etc/default
+  template: src=tomcat7 dest=/etc/default/tomcat7
+  sudo: yes
 
 - name: Download Geoserver (remote)
   sudo: yes
@@ -26,3 +29,8 @@
     owner=0
     group=0
     mode=0644
+
+- name: Restart Tomcat
+  service: name=tomcat7 state=restarted
+  sudo: yes
+

ansible/roles/geoserver/templates/tomcat7

@@ -0,0 +1,47 @@
+# Run Tomcat as this user ID. Not setting this or leaving it blank will use the
+# default of tomcat7.
+TOMCAT7_USER=tomcat7
+
+# Run Tomcat as this group ID. Not setting this or leaving it blank will use
+# the default of tomcat7.
+TOMCAT7_GROUP=tomcat7
+
+# The home directory of the Java development kit (JDK). You need at least
+# JDK version 1.5. If JAVA_HOME is not set, some common directories for
+# OpenJDK, the Sun JDK, and various J2SE 1.5 versions are tried.
+JAVA_HOME=/usr/lib/jvm/java-8-oracle
+
+# You may pass JVM startup parameters to Java here. If unset, the default
+# options will be: -Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC
+#
+# Use "-XX:+UseConcMarkSweepGC" to enable the CMS garbage collector (improved
+# response time). If you use that option and you run Tomcat on a machine with
+# exactly one CPU chip that contains one or two cores, you should also add
+# the "-XX:+CMSIncrementalMode" option.
+JAVA_OPTS="-Djava.awt.headless=true -XX:+UseConcMarkSweepGC"
+
+# To enable remote debugging uncomment the following line.
+# You will then be able to use a java debugger on port 8000.
+#JAVA_OPTS="${JAVA_OPTS} -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
+
+# Java compiler to use for translating JavaServer Pages (JSPs). You can use all
+# compilers that are accepted by Ant's build.compiler property.
+#JSP_COMPILER=javac
+
+# Use the Java security manager? (yes/no, default: no)
+#TOMCAT7_SECURITY=no
+
+# Number of days to keep logfiles in /var/log/tomcat7. Default is 14 days.
+#LOGFILE_DAYS=14
+# Whether to compress logfiles older than today's
+#LOGFILE_COMPRESS=1
+
+# Location of the JVM temporary directory
+# WARNING: This directory will be destroyed and recreated at every startup !
+#JVM_TMP=/tmp/tomcat7-temp
+
+# If you run Tomcat on port numbers that are all higher than 1023, then you
+# do not need authbind.  It is used for binding Tomcat to lower port numbers.
+# NOTE: authbind works only with IPv4.  Do not enable it when using IPv6.
+# (yes/no, default: no)
+#AUTHBIND=no

ansible/roles/postgres_postgis/tasks/main.yml

@@ -32,7 +32,5 @@
                    role_attr_flags=LOGIN,CREATEDB,NOSUPERUSER
   # in case the user already exists
   ignore_errors: True
-  sudo: yes
-  sudo_user: postgres
   notify:
     - restart postgres_postgis

ansible/roles/postgres_postgis/templates/pg_hba.conf

@@ -1,4 +1,4 @@
-local   all             postgres                                peer
+local   all             postgres                                trust
 local   all             geonode                                 trust
 local   all             all                                     trust
 host    all             all             127.0.0.1/32            md5

dataqs/airnow/airnow.py

@@ -1,5 +1,23 @@
-from __future__ import absolute_import
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+###############################################################################
+#  Copyright Kitware Inc. and Epidemico Inc.
+#
+#  Licensed under the Apache License, Version 2.0 ( the "License" );
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+###############################################################################
 
+from __future__ import absolute_import
 from ftplib import FTP
 import logging
 import os
@@ -32,6 +50,31 @@ class AirNowGRIB2HourlyProcessor(GeoDataMosaicProcessor):
                    "airnow_aqi_combined"]
     img_patterns = ["", "_pm25", "_combined"]
     layer_titles = ["Ozone", "PM25", "Combined Ozone & PM25"]
+    description = """
+U.S. Environmental Protection Agency’s (EPA) nationwide, voluntary program,
+AirNow(www.airnow.gov), provides real-time air quality data and forecasts to
+protect public health across the United States, Canada, and parts of Mexico.
+AirNowreceives real-time ozone and PM2.5data from over 2,000 monitors and
+collects air quality forecasts for more than 300 cities.
+
+As part of the Global Earth Observation System of Systems (GEOSS)
+(www.epa.gov/geoss) program, the AirNow API system broadens access to AirNowdata
+ and data products. AirNow API produces data products in several standard data
+formats and makes them available via FTP and web services. This document
+describes the GRIB2 file formats.
+
+All data provided by AirNow API are made possible by the efforts of more than
+120 local, state, tribal, provincial, and federal government agencies
+(www.airnow.gov/index.cfm?action=airnow.partnerslist). These data are not fully
+verified or validated and should be considered preliminary and subject to
+change. Data and information reported to AirNow from federal, state, local, and
+tribal agencies are for the express purpose of reporting and forecasting the
+Air Quality Index (AQI). As such, they should not be used to formulate or
+support regulation, trends, guidance, or any other government or public
+decision making. Official regulatory air quality data must be obtained from
+EPA’s Air Quality System (AQS) (www.epa.gov/ttn/airs/airsaqs). See the AirNow
+Data Exchange Guidelines at http://airnowapi.org/docs/DataUseGuidelines.pdf.
+"""
 
     def download(self, auth_account=AIRNOW_ACCOUNT, days=1):
         """
@@ -118,7 +161,8 @@ def run(self, days=1):
                 with open(os.path.join(
                         script_dir, 'resources/airnow.sld')) as sld:
                     self.set_default_style(layer_name, layer_name, sld.read())
-            self.update_geonode(layer_name, title=layer_title, store=layer_name)
+            self.update_geonode(layer_name, title=layer_title,
+                                description=self.description, store=layer_name)
             self.truncate_gs_cache(layer_name)
         self.cleanup()
 

dataqs/airnow/tasks.py

@@ -1,3 +1,22 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+###############################################################################
+#  Copyright Kitware Inc. and Epidemico Inc.
+#
+#  Licensed under the Apache License, Version 2.0 ( the "License" );
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+###############################################################################
+
 from __future__ import absolute_import
 
 from celery import shared_task