Skip to content

Hi! I cleaned up your code for you! #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GunioRobot wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Hi! I cleaned up your code for you! #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions scripts/ImportGIS.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions www/OpenLayers.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion www/css/lizardbase.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ body {
text-align:center;
}

#mainPanel > p {
#mainPanel > p {
line-height:150%;
}

Expand Down
10 changes: 5 additions & 5 deletions www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</div>
</div>
</div>

<div id="content">
<div id="homePage" class="contentPage">
<div id="sidePanel">
Expand Down Expand Up @@ -74,7 +74,7 @@ <h4>Data Mining Portal</h4>
</div>
</div>
</div>

<div id="gisPage" class="contentPage">
<div id="gisFilters">
<h4>GIS Filters</h4>
Expand All @@ -85,7 +85,7 @@ <h4>GIS Filters</h4>
<option value="both"></option>
<option value="male">Male</option>
<option value="female">Female</option>
</select>
</select>
</div>
<br>
<div>
Expand All @@ -99,7 +99,7 @@ <h4>GIS Filters</h4>
<div>
Location
<br><hr><br>
State:
State:
<select id="gisState">
<option value="Any"></option>
<option value="Florida">Florida</option>
Expand Down Expand Up @@ -180,7 +180,7 @@ <h3>Terms and Conditions of Use</h3>
<br>
<form id="dataForm">
<p>Please enter your name and affiliation below to help us track the use of this database.</p>
<input id="dataName" type="text" size="30" value="First and Last Name" />
<input id="dataName" type="text" size="30" value="First and Last Name" />
<input id="dataAffiliation" type="text" size="30" value="Affiliation" />
<input id="dataSubmit" type="submit" value="Enter" />
</form>
Expand Down
6 changes: 3 additions & 3 deletions www/js/lizardbase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 != "" ) {
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions www/theme/default/google.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.olLayerGoogleCopyright {
right: 3px;
bottom: 2px;
bottom: 2px;
}
.olLayerGooglePoweredBy {
left: 2px;
bottom: 2px;
bottom: 2px;
}

86 changes: 43 additions & 43 deletions www/theme/default/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -58,7 +58,7 @@ div.olLayerDiv {
display: block;
position: absolute;
font-size: smaller;
}
}

div.olControlMousePosition {
bottom: 0em;
Expand All @@ -84,7 +84,7 @@ div.olControlMousePosition {
.olControlOverviewMapMinimizeButton {
right: 0px;
bottom: 80px;
}
}

.olControlOverviewMapMaximizeButton {
right: 0px;
Expand Down Expand Up @@ -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;
Expand All @@ -146,80 +146,80 @@ 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;
width: 24px;
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;
Expand All @@ -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);
Expand Down Expand Up @@ -280,7 +280,7 @@ div.olControlMousePosition {
.olControlZoomPanel {
top: 71px;
left: 14px;
}
}

.olControlZoomPanel div {
background-image: url(img/zoom-panel.png);
Expand Down