Skip to content

Commit

Permalink
Merge branch 'master' of github.com:openyouthnetworks/mi-parque-appen…
Browse files Browse the repository at this point in the history 
…gine
  • Loading branch information
@codersquid
codersquid committed Dec 2, 2011
2 parents 9c90e33 + 3fc9399 commit 9a1804f
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 68 deletions.
6 changes: 3 additions & 3 deletions src/com/miparque/server/database/AbstractFtDao.java
View file
Expand Up @@ -7,6 +7,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;

import org.json.JSONException;
import org.json.JSONObject;
Expand Down Expand Up @@ -34,6 +35,7 @@
* @author codersquid
*/
public abstract class AbstractFtDao<T,K> {
public static Logger log = Logger.getLogger(AbstractFtDao.class.getName());
public abstract List<JSONObject> getJsonList(K key) throws ResourceNotFoundException, JSONException;
public abstract JSONObject getJson(K key) throws ResourceNotFoundException, JSONException;
protected abstract void validateForInsert(T entity);
Expand Down Expand Up @@ -67,8 +69,7 @@ public String insert(T entity) {
String insertSql = getInsertSql(entity);
List<String> rowids = runInsert(insertSql);
if (rowids.size() > 1) {
// This would be a WARN log line.
System.out.println("There should only be one rowid resulting from an insertion of one entity but "
log.warning("There should only be one rowid resulting from an insertion of one entity but "
+ " we got more than one. rowids: " + rowids + " entity: " + entity);
}
String rowid = rowids.get(0);
Expand Down Expand Up @@ -194,7 +195,6 @@ protected List<Map<String,String>> runSelect(String query) throws ResourceNotFou
try {
FusionTablesManager fm = new FusionTablesManager();
rows = fm.runSelect(query);
System.out.println(rows);
} catch (Exception e) {
throw new RuntimeException("Unable to find results for query: " + query, e);
}
Expand Down
117 changes: 52 additions & 65 deletions war/index.html
View file
Expand Up @@ -91,7 +91,7 @@
var e = document.createElement('script');
e.type = 'text/javascript';
e.src = document.location.protocol +
'//connect.facebook.net/en_US/all.js';
'//connect.facebook.net/en_MX/all.js';
e.async = true;
document.getElementById('fb-root').appendChild(e);
} ());
Expand Down Expand Up @@ -262,7 +262,7 @@ <h1>Mi Parque</h1>
client_id=281417341887864&
fb_only=true&
fb_register=true&
redirect_uri=http%3A%2F%2F.mi-parque.appspot.com/%2Freg?
redirect_uri=http%3A%2F%2Fmi-parque.appspot.com/%2Freg?
perms='email,sms,publish_stream,publish_actions'&
fields=[
{'name':'name'},
Expand Down Expand Up @@ -505,82 +505,69 @@ <h1>Mi Mapa</h1>
<ul data-role="listview" data-inset="true" data-theme="c" data-dividertheme="f">
<li data-role="list-divider">La Villita Map Legend</li>
<li>
<div class="ui-grid-b">
<div class="ui-block-a" style="width: 30px">
<span class="green-square"></span>
</div>
<div class="ui-block-b" style="width: 200px">
Mi Parque
</div>
</div>
<div class="ui-grid-a ui-bar small">
<div class="ui-block-a" style="width: 30px">
<span class="green-square"></span>
</div>
<div class="ui-block-b" style="width: 200px">
Mi Parque
</div>
</div>
<div class="ui-grid-a ui-bar small">
<div class="ui-block-a" style="width: 30px">
<span class="dark-green-square"></span>
</div>
<div class="ui-block-b" style="width: 200px">
Parks and Open Spaces
</div>
</div>
<div class="ui-grid-a ui-bar small">
<div class="ui-block-a" style="width: 30px">
<img src="images/quadrifoglio.png" style="width: 20px">
</div>
<div class="ui-block-b" style="width: 250px">
Neighborspace Garden
</div>
</div>
</li>
<li>
<div class="ui-grid-b">
<div class="ui-block-a" style="width: 30px">
<span class="dark-green-square"></span>
</div>
<div class="ui-block-b" style="width: 200px">
Parks and Open Spaces
</div>
</div>
Average Daily Traffic Counts
<div class="ui-grid-b ui-bar small">
<div class="ui-block-a legend-swatch" style="background: #FECC5C"></div>
<div class="ui-block-b legend-swatch" style="background: #FD8D3C"></div>
<div class="ui-block-c legend-swatch" style="background: #F03B20"></div>
</div><!-- /grid-b -->
<div class="ui-grid-b ui-bar small">
<div class="ui-block-a">< 5K</div>
<div class="ui-block-b">5K - 15K</div>
<div class="ui-block-c">> 15K</div>
</div><!-- /grid-b -->
<div class="ui-grid-a ui-bar small">
<div class="ui-block-a legend-swatch" style="background: #2716C4"></div>
<div class="ui-block-b legend-swatch" style="background: #5193C9"></div>
</div><!-- /grid-b -->
<div class="ui-grid-a ui-bar small">
<div class="ui-block-a">Public School</div>
<div class="ui-block-b">Private School</div>
</div><!-- /grid-b -->
</li>
<li>
<div class="ui-grid-b">
<div class="ui-grid-a ui-bar small">
<div class="ui-block-a" style="width: 30px">
<img src="images/quadrifoglio.png" style="height: 20px">
</div>
<div class="ui-block-b" style="width: 260px">
Neighborspace Garden
</div>
</div>
</li>
<li>
<div class="ui-grid-b">
<div id="dot1" class="ui-block-a" style="width: 30px">
</div>
<div class="ui-block-b" style="width: 260px">
Avg. Daily Traffic Ct. < 5K
</div>
</div>
</li>
<li>
<div class="ui-grid-b">
<div id="dot2" class="ui-block-a" style="width: 30px">
</div>
<div class="ui-block-b" style="width: 260px">
Avg. Daily Traffic Ct. 5K - 15K
</div>
</div>
</li>
<li>
<div class="ui-grid-b">
<div id="dot3" class="ui-block-a" style="width: 30px">
</div>
<div class="ui-block-b" style="width: 260px">
Avg. Daily Traffic Ct. > 15K
</div>
</div>
</li>
<li data-role="list-divider">Toggle Layers</li>
<li id="toggle-toxic-sites">
<div class="ui-grid-b">
<div class="ui-block-a" style="width: 30px">
<img src="images/factory.png" style="height: 20px">
<img src="images/factory.png" style="width: 20px">
</div>
<div class="ui-block-b" style="width: 250px">
Community-Submitted Toxic Site
</div>
</div>
</li>
<li id="toggle-aviso">
<div class="ui-grid-b">
<div class="ui-grid-a ui-bar small">
<div class="ui-block-a" style="width: 70px">
<img src="images/aviso_asthma_small.png" style="height: 20px">
<img src="images/aviso_air_small.png" style="height: 20px">
<img src="images/aviso_community_small.png" style="height: 20px">
<img src="images/aviso_asthma_small.png" style="width: 20px">
<img src="images/aviso_air_small.png" style="width: 20px">
<img src="images/aviso_community_small.png" style="width: 20px">
</div>
<div class="ui-block-b" style="width: 200px">
Alerts / Aviso
Community Alerts / Aviso
</div>
</div>
</li>
Expand Down

0 comments on commit 9a1804f

Please sign in to comment.