From dd556d2775a72eb1fceaf69aecf8a84e8dc20ef3 Mon Sep 17 00:00:00 2001 From: "Gun.io Whitespace Robot" Date: Sun, 30 Oct 2011 07:15:42 -0400 Subject: [PATCH] Remove whitespace [Gun.io WhitespaceBot] --- scripts/ImportGIS.scala | 12 ++--- www/OpenLayers.js | 18 ++++---- www/css/lizardbase.css | 2 +- www/index.html | 10 ++--- www/js/lizardbase.js | 6 +-- www/theme/default/google.css | 4 +- www/theme/default/style.css | 86 ++++++++++++++++++------------------ 7 files changed, 69 insertions(+), 69 deletions(-) diff --git a/scripts/ImportGIS.scala b/scripts/ImportGIS.scala index c3bca52..09c2adc 100644 --- a/scripts/ImportGIS.scala +++ b/scripts/ImportGIS.scala @@ -51,13 +51,13 @@ try { val latStr = line( 7 ) var index = 8 - var measurements: List[Double] = List[Double]() + var measurements: List[Double] = List[Double]() while ( index < 18 ) { val num = if( line( index ) == "" ) { 0.0 } else { line( index ).toDouble } index += 1 measurements = num :: measurements - } - + } + if( lonStr != "" && latStr != "" ) { val lon = lonStr.toDouble val lat = latStr.toDouble @@ -67,7 +67,7 @@ try { val specId = getSpecId( spec, sex, year, measurements, userId ) if( locId > 0 && specId > 0 ) { - val query = + val query = String.format( """INSERT INTO gis.geom (locid,specid,userid,geom) VALUES @@ -94,8 +94,8 @@ try { def getLocId( name: String, county: String, state: String, country: String, userId: Long ): Long = { getId( - String.format( - """SELECT locId FROM gis.location + String.format( + """SELECT locId FROM gis.location WHERE name='%s' AND county='%s' AND state='%s' AND country='%s'""", name, county, state, country ), String.format( """INSERT INTO gis.location diff --git a/www/OpenLayers.js b/www/OpenLayers.js index abfc60c..39840cf 100644 --- a/www/OpenLayers.js +++ b/www/OpenLayers.js @@ -23,23 +23,23 @@ * *--------------------------------------------------------------------------*/ -/** -* +/** +* * Contains portions of Rico -* -* Copyright 2005 Sabre Airline Solutions -* +* +* Copyright 2005 Sabre Airline Solutions +* * 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 -* +* +* 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. +* permissions and limitations under the License. * **/ diff --git a/www/css/lizardbase.css b/www/css/lizardbase.css index 1df75aa..c3e2649 100644 --- a/www/css/lizardbase.css +++ b/www/css/lizardbase.css @@ -131,7 +131,7 @@ body { text-align:center; } -#mainPanel > p { +#mainPanel > p { line-height:150%; } diff --git a/www/index.html b/www/index.html index 3a51d67..9579ec9 100644 --- a/www/index.html +++ b/www/index.html @@ -31,7 +31,7 @@ - +
@@ -74,7 +74,7 @@

Data Mining Portal

- +

GIS Filters

@@ -85,7 +85,7 @@

GIS Filters

- +

@@ -99,7 +99,7 @@

GIS Filters

Location

- State: + State: + diff --git a/www/js/lizardbase.js b/www/js/lizardbase.js index 58c2d34..a1a803d 100644 --- a/www/js/lizardbase.js +++ b/www/js/lizardbase.js @@ -127,7 +127,7 @@ function makeMap() { } if( gisYearFrom.value != null && gisYearFrom.value != "" ) { - cql_filter_query = cql_filter_query + " AND year > " + gisYearFrom.value + cql_filter_query = cql_filter_query + " AND year > " + gisYearFrom.value } if( gisYearTo.value != null && gisYearTo.value != "" ) { @@ -160,13 +160,13 @@ function makeMap() { map.addLayers([gphy, gmap, ghyb, gsat, lizardBase]); info = new OpenLayers.Control.WMSGetFeatureInfo({ - url: 'http://ec2-174-129-239-85.compute-1.amazonaws.com/geoserver/wms?service=wms', + url: 'http://ec2-174-129-239-85.compute-1.amazonaws.com/geoserver/wms?service=wms', title: 'Anole Specimen', queryVisible: true, eventListeners: { getfeatureinfo: function(event) { map.addPopup(new OpenLayers.Popup.FramedCloud( - "anoleLoc", + "anoleLoc", map.getLonLatFromPixel(event.xy), null, event.text, diff --git a/www/theme/default/google.css b/www/theme/default/google.css index 7f3c369..7488569 100644 --- a/www/theme/default/google.css +++ b/www/theme/default/google.css @@ -1,9 +1,9 @@ .olLayerGoogleCopyright { right: 3px; - bottom: 2px; + bottom: 2px; } .olLayerGooglePoweredBy { left: 2px; - bottom: 2px; + bottom: 2px; } diff --git a/www/theme/default/style.css b/www/theme/default/style.css index cd29d4d..4bc55c9 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -15,17 +15,17 @@ div.olLayerDiv { .olLayerGoogleCopyright { left: 2px; - bottom: 2px; + bottom: 2px; } .olLayerGooglePoweredBy { left: 2px; - bottom: 15px; + bottom: 15px; } .olControlAttribution { - font-size: smaller; - right: 3px; - bottom: 4.5em; - position: absolute; + font-size: smaller; + right: 3px; + bottom: 4.5em; + position: absolute; display: block; } .olControlScale { @@ -58,7 +58,7 @@ div.olLayerDiv { display: block; position: absolute; font-size: smaller; -} +} div.olControlMousePosition { bottom: 0em; @@ -84,7 +84,7 @@ div.olControlMousePosition { .olControlOverviewMapMinimizeButton { right: 0px; bottom: 80px; -} +} .olControlOverviewMapMaximizeButton { right: 0px; @@ -125,12 +125,12 @@ div.olControlMousePosition { .olPopupContent { padding:5px; overflow: auto; -} -.olControlNavToolbar { +} +.olControlNavToolbar { width:0px; height:0px; -} -.olControlNavToolbar div { +} +.olControlNavToolbar div { display:block; width: 28px; height: 28px; @@ -146,43 +146,43 @@ div.olControlMousePosition { height: 24px; } -.olControlNavigationHistoryPreviousItemActive { +.olControlNavigationHistoryPreviousItemActive { background-position: 0px 0px; } -.olControlNavigationHistoryPreviousItemInactive { +.olControlNavigationHistoryPreviousItemInactive { background-position: 0px -24px; } -.olControlNavigationHistoryNextItemActive { +.olControlNavigationHistoryNextItemActive { background-position: -24px 0px; } -.olControlNavigationHistoryNextItemInactive { +.olControlNavigationHistoryNextItemInactive { background-position: -24px -24px; } -.olControlNavToolbar .olControlNavigationItemActive { +.olControlNavToolbar .olControlNavigationItemActive { background-image: url("img/panning-hand-on.png"); background-repeat: no-repeat; } -.olControlNavToolbar .olControlNavigationItemInactive { +.olControlNavToolbar .olControlNavigationItemInactive { background-image: url("img/panning-hand-off.png"); background-repeat: no-repeat; } -.olControlNavToolbar .olControlZoomBoxItemActive { +.olControlNavToolbar .olControlZoomBoxItemActive { background-image: url("img/drag-rectangle-on.png"); background-color: orange; background-repeat: no-repeat; } -.olControlNavToolbar .olControlZoomBoxItemInactive { +.olControlNavToolbar .olControlZoomBoxItemInactive { background-image: url("img/drag-rectangle-off.png"); background-repeat: no-repeat; } .olControlEditingToolbar { float:right; right: 0px; - height: 30px; + height: 30px; width: 200px; } -.olControlEditingToolbar div { +.olControlEditingToolbar div { background-image: url("img/editing_tool_bar.png"); background-repeat: no-repeat; float:right; @@ -190,36 +190,36 @@ div.olControlMousePosition { height: 24px; margin: 5px; } -.olControlEditingToolbar .olControlNavigationItemActive { - background-position: -103px -23px; +.olControlEditingToolbar .olControlNavigationItemActive { + background-position: -103px -23px; } -.olControlEditingToolbar .olControlNavigationItemInactive { - background-position: -103px -0px; +.olControlEditingToolbar .olControlNavigationItemInactive { + background-position: -103px -0px; } -.olControlEditingToolbar .olControlDrawFeaturePointItemActive { - background-position: -77px -23px; +.olControlEditingToolbar .olControlDrawFeaturePointItemActive { + background-position: -77px -23px; } -.olControlEditingToolbar .olControlDrawFeaturePointItemInactive { - background-position: -77px -0px; +.olControlEditingToolbar .olControlDrawFeaturePointItemInactive { + background-position: -77px -0px; } -.olControlEditingToolbar .olControlDrawFeaturePathItemInactive { - background-position: -51px 0px; +.olControlEditingToolbar .olControlDrawFeaturePathItemInactive { + background-position: -51px 0px; } -.olControlEditingToolbar .olControlDrawFeaturePathItemActive { - background-position: -51px -23px; +.olControlEditingToolbar .olControlDrawFeaturePathItemActive { + background-position: -51px -23px; } -.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive { - background-position: -26px 0px; +.olControlEditingToolbar .olControlDrawFeaturePolygonItemInactive { + background-position: -26px 0px; } -.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive { - background-position: -26px -23px ; +.olControlEditingToolbar .olControlDrawFeaturePolygonItemActive { + background-position: -26px -23px ; } -.olControlSaveFeaturesItemActive { +.olControlSaveFeaturesItemActive { background-image: url(img/save_features_on.png); background-repeat: no-repeat; background-position: 0px 1px; } -.olControlSaveFeaturesItemInactive { +.olControlSaveFeaturesItemInactive { background-image: url(img/save_features_off.png); background-repeat: no-repeat; background-position: 0px 1px; @@ -240,12 +240,12 @@ div.olControlMousePosition { opacity: 0.50; font-size: 1px; filter: alpha(opacity=50); -} +} .olControlPanPanel { top: 10px; left: 5px; -} +} .olControlPanPanel div { background-image: url(img/pan-panel.png); @@ -280,7 +280,7 @@ div.olControlMousePosition { .olControlZoomPanel { top: 71px; left: 14px; -} +} .olControlZoomPanel div { background-image: url(img/zoom-panel.png);