Skip to content

Remove HereDummyFunc and the one usage #1510

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

Closed
MartinRiese wants to merge 1 commit into from
Closed

Remove HereDummyFunc and the one usage #1510

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
4 changes: 0 additions & 4 deletions src/cli/java/org/commcare/util/screen/EntityScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,6 @@ public boolean initReferences(SessionWrapper session) throws CommCareSessionExce
referenceMap.put(getReturnValueFromSelection(reference, needed, evalContext), reference);
}

// for now override 'here()' with the coords of Sao Paulo, eventually allow dynamic
// setting
evalContext.addFunctionHandler(new ScreenUtils.HereDummyFunc(-23.56, -46.66));

if (shouldAutoSelect()) {
if (!this.setCurrentScreenToDetail()) {
readyToSkip = true;
Expand Down
32 changes: 0 additions & 32 deletions src/cli/java/org/commcare/util/screen/ScreenUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,36 +81,4 @@ public static String getAppTitle() {
return "CommCare";
}
}

public static class HereDummyFunc implements IFunctionHandler {
private final double lat;
private final double lon;

public HereDummyFunc(double lat, double lon) {
this.lat = lat;
this.lon = lon;
}

@Override
public String getName() {
return "here";
}

@Override
public Vector getPrototypes() {
Vector<Class[]> p = new Vector<>();
p.addElement(new Class[0]);
return p;
}

@Override
public boolean rawArgs() {
return false;
}

@Override
public Object eval(Object[] args, EvaluationContext ec) {
return new GeoPointData(new double[]{lat, lon, 0, 10}).getDisplayText();
}
}
}
Loading