Skip to content

Commit

Permalink
Merge pull request #44 from 1019474263/master
Browse files Browse the repository at this point in the history 
changed the names to be matched with the new database
  • Loading branch information
@skorasaurus
skorasaurus committed Dec 27, 2017
2 parents 7f86984 + 0fbd7a6 commit 97b0e26
Showing 1 changed file with 26 additions and 25 deletions.
51 changes: 26 additions & 25 deletions lots/static/js/largelots_cleveland.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ var LargeLots = {
if(props.number){
info += "<p>Address: " + LargeLots.formatAddress(props) + "</p>";
}
info += "<p>PPN: " + props.parcel + "<br />";
info += "<p>PPN: " + props.parcelpo_1 + "<br />";
// if (props.build){
// info += "Zoned: " + props.build + "<br />";
// }
if (props.sqft){
info += "<p>Sq Ft: " + props.sqft + "<br />";
if (props.landreus_3){
info += "<p>Sq Ft: " + props.landreus_3 + "<br />";
}
this._div.innerHTML = info;
}
Expand All @@ -65,14 +65,14 @@ var LargeLots = {

LargeLots.info.addTo(LargeLots.map);

var fields = "ppn,parcel,address,sqft,street,number" //"pin14,zoning_classification,ward,street_name,street_dir,street_number,street_type,city_owned,residential"
var fields = "parcelpo_5,parcelpo_1,parcelpo_4,landreus_3,parcelpo_3,parcelpo_2" //"pin14,zoning_classification,ward,street_name,street_dir,street_number,street_type,city_owned,residential"
var layerOpts = {
user_name: 'opencleveland',
user_name: 'openclevelandgis',
type: 'cartodb',
cartodb_logo: false,
sublayers: [
{
sql: "SELECT * FROM joined WHERE (street != '') AND (number != '')",
sql: "SELECT * FROM sideyard WHERE (parcelpo_3 != '') AND (parcelpo_2 != '')",
cartocss: $('#egp-styles').html().trim(),
interactivity: fields
}
Expand All @@ -82,6 +82,7 @@ var LargeLots = {
// }
]
}

cartodb.createLayer(LargeLots.map, layerOpts)
.addTo(LargeLots.map)
.done(function(layer) {
Expand All @@ -97,19 +98,19 @@ var LargeLots = {
});
LargeLots.lotsLayer.on('featureClick', function(e, pos, latlng, data){
// console.log(data['parcel']);
LargeLots.getOneParcel(data['parcel']);
LargeLots.getOneParcel(data['parcelpo_1']);
});
window.setTimeout(function(){
if($.address.parameter('ppn')){
LargeLots.getOneParcel($.address.parameter('parcel'))
if($.address.parameter('parcelpo_5')){
LargeLots.getOneParcel($.address.parameter('parcelpo_1'))
}
}, 1000)
}).error(function(e) {
console.log('ERROR')
console.log(e)
});

$("#search_address").val(LargeLots.convertToPlainString($.address.parameter('address')));
$("#search_address").val(LargeLots.convertToPlainString($.address.parameter('parcelpo_4')));
LargeLots.addressSearch();
$('.toggle-parcels').on('click', function(e){
if($(e.target).is(':checked')){
Expand All @@ -128,7 +129,7 @@ var LargeLots = {
checks.push($(box).attr('id'))
}
});
var sql = 'select * from joined where ';
var sql = 'select * from sideyard where ';
var clauses = []
if(checks.indexOf('applied') >= 0){
clauses.push('status = 1')
Expand All @@ -140,23 +141,23 @@ var LargeLots = {
clauses = clauses.join(' or ');
sql += clauses;
} else {
sql = 'select * from joined where status not in (0,1)'
sql = 'select * from sideyard where status not in (0,1)'
}
LargeLots.lotsLayer.setSQL(sql);
},

formatAddress: function (prop) {
return prop.number + " " + " " + prop.street;
return prop.parcelpo_2 + " " + " " + prop.parcelpo_3;
},

getOneParcel: function(ppn_current){
if (LargeLots.lastClickedLayer){
LargeLots.map.removeLayer(LargeLots.lastClickedLayer);
}
var sql = new cartodb.SQL({user: 'opencleveland', format: 'geojson'});
var sql = new cartodb.SQL({user: 'openclevelandgis', format: 'geojson'});
//Issue #4: using apostrophes instead of casting to keep leading zeros. - ASKoiman 12/6/2014 -- \'{{num}}\' -- cwang
console.log(ppn_current);
sql.execute('SELECT * from joined WHERE parcel = \'{{num}}\'', {num:ppn_current})
sql.execute('SELECT * from sideyard WHERE parcelpo_1 = \'{{num}}\'', {num:ppn_current})
.done(function(data){
var shape = data.features[0];
LargeLots.lastClickedLayer = L.geoJson(shape);
Expand All @@ -170,28 +171,28 @@ var LargeLots = {

selectParcel: function (props){
// console.log(props);
var address = LargeLots.formatAddress(props);
var parcelpo_4 = LargeLots.formatAddress(props);

var info = "<div class='row'><div class='col-xs-6 col-md-12'>\
<table class='table table-bordered table-condensed'><tbody>\
<tr><td>Address</td><td>" + address + "</td></tr>\
<tr><td>Parcel Number</td><td>" + props.parcel + " (<a target='_blank' href='http://treasurer.cuyahogacounty.us/payments/real_prop/ShowTaxBill.asp?txtParcel=" + props.ppn + "'>info</a>)</td></tr>";
<tr><td>Address</td><td>" + parcelpo_4 + "</td></tr>\
<tr><td>Parcel Number</td><td>" + props.parcelpo_1 + " (<a target='_blank' href='http://treasurer.cuyahogacounty.us/payments/real_prop/ShowTaxBill.asp?txtParcel=" + props.parcelpo_5 + "'>info</a>)</td></tr>";
// if (props.build){
// info += "<tr><td>Zoned</td><td>" + props.build + "</td></tr>";
// }
if (props.sqft){
info += "<tr><td>Square feet</td><td>" + LargeLots.addCommas(props.sqft) + "</td></tr>";
info += "<tr><td>Square feet</td><td>" + LargeLots.addCommas(props.landreus_3) + "</td></tr>";
}
info += "<tr><td colspan='2'><button type='button' id='lot_apply' data-ppn='" + props.parcel + "' data-address='" + address + "' href='#' class='btn btn-success'>Select this lot</button></td></tr>"
info += "<tr><td colspan='2'><button type='button' id='lot_apply' data-parcelpo_1='" + props.parcelpo_1 + "' data-parcelpo_4='" + parcelpo_4 + "' href='#' class='btn btn-success'>Select this lot</button></td></tr>"
// info += "</tbody></table></div><div class='col-xs-6 col-md-12'>\
// <img class='img-responsive img-thumbnail' src='http://cookviewer1.cookcountyil.gov/Jsviewer/image_viewer/requestImg.aspx?" + props.pin14 + "=' /></div></div>";
$.address.parameter('parcel', props.parcel)
$.address.parameter('parcelpo_1', props.parcelpo_1)
$('#lot-info').html(info);

$("#lot_apply").on("click", function(){
// if ($("#id_lot_1_address").val() == "") {
$("#id_lot_1_address").val($(this).data('address'));
$("#id_lot_1_ppn").val($(this).data('ppn'));
$("#id_lot_1_address").val($(this).data('parcelpo_4'));
$("#id_lot_1_ppn").val($(this).data('parcelpo_1'));
// }

// else if ($("#id_lot_1_address").val() != $(this).data('address')){
Expand Down Expand Up @@ -225,7 +226,7 @@ var LargeLots = {
}
}

$.address.parameter('address', encodeURIComponent(searchAddress));
$.address.parameter('parcelpo__4', encodeURIComponent(searchAddress));

var s = document.createElement("script");
s.type = "text/javascript";
Expand All @@ -237,7 +238,7 @@ var LargeLots = {

returnAddress: function (response){
if(!response.length){
$('#addr_search_modal').html(LargeLots.convertToPlainString($.address.parameter('address')));
$('#addr_search_modal').html(LargeLots.convertToPlainString($.address.parameter('parcelpo_4')));
$('#modalGeocode').modal('show');
return;
}
Expand Down

0 comments on commit 97b0e26

Please sign in to comment.